cuilei
2025-06-16 1b8b8bafca4fe4c3556bda5e66e3ff6252bd7acc
Merge remote-tracking branch 'origin/master'

# Conflicts:
# src/views/tms/modules/outBound/OutboundOrderModal.vue
已添加1个文件
已修改19个文件
939 ■■■■ 文件已修改
src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainTop.vue 48 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModalForm.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue 44 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue 41 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/common/TableContextMenu.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/FlowTodo.vue 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue 413 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/baseTools/BaseToolsListRight.vue 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundDetailSelectList.vue 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundModal.vue 35 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundOrderModal.vue 32 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/modules/outBound/OutboundOrderSelectList.vue 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/requirement/ToolSharpeningList .vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/requirement/modules/ToolsSharpeningModal.vue 81 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/stocktakingBound/ToolsStocktaKingBoundDetail.vue 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/stocktakingBound/modules/ToolSelectorModal.vue 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainTop.vue
@@ -29,6 +29,7 @@
import HasSentDocumentTableList from './Document/HasSentDocumentTableList'
import HasReceivedDocumentTableList from './Document/HasReceivedDocumentTableList'
import DocumentBatchDeleteModal from '../../../common/DocumentBatchDeleteModal'
import { postAction } from '@api/manage'
export default {
  name: 'DeviceStructureMainTop',
@@ -44,7 +45,10 @@
      tableContainerSize: 'small',
      currentTypeOfDevice: 7,// äº§å“ç»“构树中定义的设备层级type为7
      currentRightClickedTableRowInfo: {},
      hasLoadedDataTabKeyArray: []
      hasLoadedDataTabKeyArray: [],
      url:{
        submitProccess:'/dncFlow/dispatchFile/submitProccess'
      }
    }
  },
  created() {
@@ -172,7 +176,47 @@
        }
      })
    },
    handleAppoint(){
      const that = this
      const { docId, param, attributionId,attributionType,publishFileId } = this.currentRightClickedTableRowInfo
      that.$confirm({
        title: '提示',
        content: `确认定型吗?`,
        okText: '确认',
        cancelText: '取消',
        onOk: () => {
          let dispatchFile = {
            'docId':docId,
            'attributionId':attributionId,
            'attributionType':attributionType,
            'fileId':publishFileId
          }
          postAction(this.url.submitProccess,dispatchFile)
            .then(res => {
              if (res.success) {
                this.$message.success('流程发起成功')
              } else {
                that.$notification.error({
                  message: '消息',
                  description: res.message
                })
              }
            })
            .catch(err => {
              that.$notification.error({
                message: '消息',
                description: err.message
              })
            })
            .finally(() => {
              that.$destroyAll()
            })
        },
        onCancel: () => {
          that.$destroyAll()
        }
      })
    },
    /**
     * ç‚¹å‡»æ‰¹é‡åˆ é™¤åŽå‡ºçŽ°å¼¹çª—
     * @param modalTitle å¼¹çª—标题
src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModalForm.vue
@@ -49,7 +49,7 @@
      deviceCustomTypeList: [],
      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 }
        sm: { span: 7 }
      },
      wrapperCol: {
        xs: { span: 24 },
src/views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeTableList.vue
@@ -9,8 +9,9 @@
<script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import DeviceCustomTypeModal from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModal.vue'
import { deleteAction } from '@api/manage'
  import DeviceCustomTypeModal
    from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModal.vue'
  import { getAction, deleteAction } from '@api/manage'
export default {
  name: 'DeviceCustomTypeTableList',
@@ -67,13 +68,36 @@
  },
  methods: {
    setQueryParamAndLoadData() {
      console.log('currentLevelInfo', this.currentTreeNodeInfo)
      const { id, type } = this.currentTreeNodeInfo
      this.queryParam = Object.assign({}, { attributionId: id, attributionType: type })
      this.dataSource = []
      this.loadData()
    },
      loadData() {
        const params = this.getQueryParams()//查询条件
        this.loading = true
        getAction(this.url.list, params)
          .then((res) => {
            if (res.success) {
              this.dataSource = res.result.records || res.result
              const { autoClickedLevelInfo } = this.currentTreeNodeInfo
              if (autoClickedLevelInfo) {
                const tableRowRecord = this.dataSource.find(item => item.id === autoClickedLevelInfo.attributionId)
                this.handleTableRowClick(tableRowRecord)
              }
            } else {
              this.$message.warning(res.message)
            }
          }).finally(() => {
          this.loading = false
        })
      },
      /**
       * è‡ªå®šä¹‰è¡¨æ ¼è¡ŒåŠŸèƒ½
       * @param record è¡¨æ ¼è¡Œè®°å½•
       */
    customRow(record) {
      return {
        style: {
@@ -86,12 +110,20 @@
            this.$emit('handleTableContextMenuOpen', this.currentRightClickedTypeInfo)
          },
          click: () => {
              this.handleTableRowClick(record)
            }
          }
        }
      },
      /**
       * è¡¨æ ¼è¡Œç‚¹å‡»äº‹ä»¶
       * @param record è¡¨æ ¼è¡Œè®°å½•
       */
      handleTableRowClick(record) {
            if (this.currentClickedTypeInfo.id === record.id) return
            this.currentClickedTypeInfo = Object.assign({}, record)
            this.$bus.$emit('sendCurrentClickedTypeInfo', record)
          }
        }
      }
    },
    /**
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchNcModal.vue
@@ -49,7 +49,7 @@
                    </a-form-item>
                  </a-col>
                  <a-col :md="11" :sm="11">
                  <a-col :md="7" :sm="7">
                    <a-form-item label="上传时间">
                      <a-range-picker v-model="date" value-format="YYYY-MM-DD"
                                      @change="handleDateChange" allow-clear></a-range-picker>
@@ -66,7 +66,7 @@
            <a-table :columns="columns" :data-source="dataSource" bordered :pagination="false" :loading="loading"
                     :rowSelection="{selectedRowKeys: selectedRowKeys,selectedRows:selectionRows, onChange: onSelectChange}"
                     @change="handleTableChange"
                     @change="handleTableChange" :customRow="customRow"
                     :scroll="{y:456}" :size="size" rowKey="docId">
              <!-- å­—符串超长截取省略号显示-->
@@ -120,6 +120,8 @@
        </a-tabs>
      </div>
    </div>
  </a-modal>
</template>
@@ -229,6 +231,7 @@
      searchValue: '',
      searchInput: '',
      spinning: false,
        fullScreenSpinning: false,
      treeDataSource: [],
      allTreeKeys: [],
      checkedKeys: [],
@@ -265,6 +268,7 @@
    handleSearchNc() {
      this.visible = true
    },
    // èŽ·å–å½“å‰å¯¹åº”æ–‡æ¡£åˆ—è¡¨
    loadData() {
      this.dataSource = []
@@ -283,6 +287,36 @@
      }).finally(() => {
        this.loading = false
      })
      },
      /**
       * åˆ—表自定义行
       * @param record åˆ—表行记录
       */
      customRow(record) {
        return {
          style: {
            cursor: 'pointer'
          },
          on: {
            click: () => {
              let selectedRowKeys = [...this.selectedRowKeys]
              let selectionRows = [...this.selectionRows]
              if (selectedRowKeys.includes(record.docId)) {
                selectedRowKeys = selectedRowKeys.filter(item => item !== record.docId)
                selectionRows = selectionRows.filter(item => item.docId !== record.docId)
              } else {
                selectedRowKeys.push(record.docId)
                selectionRows.push(record)
              }
              this.onSelectChange(selectedRowKeys, selectionRows)
            },
            dblclick: () => {
              this.$emit('searchTreeNode', record)
              this.visible = false
            }
          }
        }
    },
    // èŽ·å–DNC设备树
@@ -508,7 +542,7 @@
      this.searchInput = ''
      this.expandedKeys = []
      this.selectedRowKeys = []
      this.selectionRows = {}
        this.selectionRows = []
      this.checkedKeys = []
      this.filters = {}
      this.isorter = Object.assign({}, this.defaultSorter)
@@ -540,7 +574,6 @@
      background-color: rgb(204, 204, 204);
    }
  }
}
::-webkit-scrollbar {
src/views/dnc/base/modules/ProductStructure/Document/NcDocumentTableList.vue
@@ -117,8 +117,7 @@
        this.$message.error('请设置url.list属性!')
        return
      }
      console.log('currentNCDocumentAttributionInfo', this.currentNCDocumentAttributionInfo)
      const { attributionId, attributionType, docClassCode } = this.currentNCDocumentAttributionInfo
        const { attributionId, attributionType, docClassCode, autoClickedLevelInfo } = this.currentNCDocumentAttributionInfo
      //加载数据 è‹¥ä¼ å…¥å‚æ•°1则加载第一页的内容
      if (arg === 1) this.ipagination.current = 1
      var params = this.getQueryParams()//查询条件
@@ -131,6 +130,11 @@
      getAction(this.url.list + `/${this.ipagination.current}/${this.ipagination.pageSize}`, params).then((res) => {
        if (res.success) {
          this.dataSource = res.result.records
            if (autoClickedLevelInfo) {
              const tableRowRecord = this.dataSource.find(item => item.docId === autoClickedLevelInfo.docId)
              this.handleTableRowClick(tableRowRecord)
              this.$bus.$emit('searchNcFinished')
            }
          if (res.result.total) {
            this.ipagination.total = res.result.total
          } else {
@@ -144,6 +148,10 @@
      })
    },
      /**
       * è‡ªå®šä¹‰è¡¨æ ¼è¡ŒåŠŸèƒ½
       * @param record è¡¨æ ¼è¡Œè®°å½•
       */
    customRow(record) {
      return {
        style: {
@@ -156,12 +164,20 @@
            this.$emit('handleTableContextMenuOpen', this.currentRightClickedDocumentInfo)
          },
          click: () => {
              this.handleTableRowClick(record)
            }
          }
        }
      },
      /**
       * è¡¨æ ¼è¡Œç‚¹å‡»äº‹ä»¶
       * @param record è¡¨æ ¼è¡Œè®°å½•
       */
      handleTableRowClick(record) {
            if (this.currentClickedDocumentInfo.docId === record.docId) return
            this.currentClickedDocumentInfo = Object.assign({}, record)
            this.$bus.$emit('sendCurrentClickedDocumentInfo', record)
          }
        }
      }
    },
    /**
src/views/dnc/base/modules/ProductStructure/ProductStructureMainTop.vue
@@ -94,15 +94,15 @@
     * @param treeNodeInfo æ ‘节点信息
     */
    receiveCurrentTreeNodeInfo(treeNodeInfo) {
      console.log('treeNodeInfo', treeNodeInfo)
      const { id, type } = treeNodeInfo
        const { id, type, autoClickedLevelInfo } = treeNodeInfo
      // ä»Žæ ‘组件接受树节点信息后从父组件流入子组件并重置数据
      this.currentClickedTypeInfo = this.currentRightClickedTableRowInfo = {}
      this.currentTreeNodeInfo = treeNodeInfo
      this.currentNCDocumentAttributionInfo = Object.assign({}, {
        attributionId: id,
        attributionType: type,
        docClassCode: 'NC'
          docClassCode: 'NC',
          autoClickedLevelInfo
      })
      this.hasLoadedDataTabKeyArray = []
@@ -113,7 +113,8 @@
            this.$refs.deviceCustomTypeTableList.setQueryParamAndLoadData()
            // åˆ‡æ¢æ ‘之后清空NC程序列表
            if (this.$refs.ncDocumentTableListRef && this.$refs.ncDocumentTableListRef.dataSource.length > 0) this.$refs.ncDocumentTableListRef.dataSource = []
          } else if (this.$refs.ncDocumentTableListRef) this.$refs.ncDocumentTableListRef.loadData(1)
            }
            else if (this.$refs.ncDocumentTableListRef) this.$refs.ncDocumentTableListRef.loadData(1)
        })
      } else {
        this.activeTabKey = 2
@@ -130,11 +131,13 @@
     */
    receiveCurrentClickedTypeInfo(record) {
      const { id, attributionType } = record
        const { autoClickedLevelInfo } = this.currentTreeNodeInfo
      this.currentClickedTypeInfo = Object.assign({}, record)
      this.currentNCDocumentAttributionInfo = Object.assign({}, {
        attributionId: id,
        attributionType,
        docClassCode: 'NC'
          docClassCode: 'NC',
          autoClickedLevelInfo
      })
      this.$nextTick(() => {
        if (this.$refs.ncDocumentTableListRef) this.$refs.ncDocumentTableListRef.loadData(1)
src/views/dnc/base/modules/ProductStructure/ProductStructureTree.vue
@@ -64,11 +64,16 @@
    <!--检索电子模板弹窗-->
    <NcDocumentSearchModal :currentDocumentInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
    <!--检索NC文件弹窗-->
    <NcDocumentSearchNcModal :currentDocumentInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
    <NcDocumentSearchNcModal :currentDocumentInfo="rightClickSelected" @searchTreeNode="searchTreeNode"
                             @submitSuccess="modalFormSubmitSuccess"/>
    <!--引用部件-->
    <NcComponentBorrowModal :currentBorrowInfo="rightClickSelected" @submitSuccess="modalFormSubmitSuccess" />
    <!--产品结构树基本右键菜单(空白处触发)-->
    <ProductStructureBaseContextMenu ref="baseContextmenuRef" />
    <div class="full-screen-container" v-if="fullScreenSpinning">
      <a-spin :spinning="fullScreenSpinning" size="large" tip="NC文件检索中..."/>
    </div>
  </a-card>
</template>
@@ -83,7 +88,8 @@
import ProcessModal from './Process/ProcessModal'
import ProcessStepModal from './ProcessStep/ProcessStepModal'
import AssignPermissionModal from './Permission/AssignPermissionModal'
import DeviceCustomTypeModal from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModal.vue'
  import DeviceCustomTypeModal
    from '@views/dnc/base/modules/ProductStructure/DeviceCustomType/DeviceCustomTypeModal.vue'
import ProductStructureBaseContextMenu
  from '@views/dnc/base/modules/ProductStructure/ProductStructureBaseContextMenu.vue'
import NcDocumentSearchModal from '@views/dnc/base/modules/ProductStructure/Document/NcDocumentSearchModal.vue'
@@ -122,6 +128,7 @@
      checkStrictly: true,
      allTreeKeys: [],
      rightClickSelected: {},
        fullScreenSpinning: false,
      url: {
        delete: '/nc/product/delete'
      }
@@ -130,6 +137,7 @@
  created() {
    this.getTreeDataByApi()
    this.$bus.$on('treeMenuItemMethodTrigger', this.triggerCorrespondingMethod)
      this.$bus.$on('searchNcFinished', () => this.fullScreenSpinning = false)
  },
  beforeDestroy() {
    this.$bus.$off('treeMenuItemMethodTrigger', this.triggerCorrespondingMethod)
@@ -161,11 +169,11 @@
    /**
     * æ ‘节点选中时触发
     * @param selectedKeys é€‰ä¸­èŠ‚ç‚¹key
     * @param {node} node èŠ‚ç‚¹å¯¹è±¡
       * @param eventOrRecord  èŠ‚ç‚¹å¯¹è±¡æˆ–è€…æ‰‹åŠ¨ä¼ å…¥record
     */
    handleTreeSelect(selectedKeys, { node }) {
      handleTreeSelect(selectedKeys, eventOrRecord) {
      const that = this
      let record = node.dataRef
        let record = eventOrRecord.node ? eventOrRecord.node.dataRef : eventOrRecord
      const { id, type } = record
      dncApi.getProductStructureTreeNodeEntityApi({ id, type })
        .then(res => {
@@ -282,6 +290,24 @@
      this.autoExpandParent = false
    },
      /**
       * æ£€ç´¢NC文件弹窗中双击行记录后触发搜索NC文件对应树节点并模拟选中树节点查询对应设备类或NC文件
       * @param searchNcRecord æ£€ç´¢NC文件弹窗中双击获得的NC文件列表行记录
       */
      searchTreeNode(searchNcRecord) {
        this.fullScreenSpinning = true
        const { attributionId, nodeCode, nodeName, nodeId, docId } = searchNcRecord
        this.searchInput = `[${nodeCode}]${nodeName}`
        this.searchAndExpandTreeNode()
        const treeNodeRecord = Object.assign({
          autoClickedLevelInfo: {
            attributionId,
            docId
          }
        }, this.getTreeNodeRecord(nodeId, this.treeDataSource))
        this.handleTreeSelect([treeNodeRecord.id], treeNodeRecord)
      },
    // è¾“入查询内容变化时触发(增加防抖机制)
    handleSearchInputChange() {
      const that = this
@@ -339,6 +365,26 @@
        }
      }
      return parentKey
      },
      /**
       * é€’归获得输入项的record对象
       * @param key record对象key值
       * @param tree æ ‘节点
       */
      getTreeNodeRecord(key, tree) {
        let treeNodeRecord
        for (let i = 0; i < tree.length; i++) {
          const node = tree[i]
          if (node.children) {
            if (node.children.findIndex(item => item.key === key) > -1) {
              treeNodeRecord = node.children.find(item => item.key === key)
            } else if (this.getTreeNodeRecord(key, node.children)) {
              treeNodeRecord = this.getTreeNodeRecord(key, node.children)
            }
          }
        }
        return treeNodeRecord
    },
    /**
@@ -436,6 +482,20 @@
  width: 8px;
}
  .full-screen-container {
    position: fixed;
    top: 0;
    left: 0;
    right: 0;
    bottom: 0;
    background-color: rgba(0, 0, 0, .8);
    z-index: 9999;
    display: flex;
    flex-direction: column;
    justify-content: center;
    align-items: center;
  }
@media screen and (min-width: 1920px) {
  .tree_con {
    height: 748px !important;
src/views/dnc/common/TableContextMenu.vue
@@ -96,6 +96,7 @@
            { label: '下载', code: 'document_download', subMenu: [], icon: 'download', isCommonMethod: true },
            { label: '删除', code: 'document_delete', subMenu: [], icon: 'delete', isCommonMethod: true },
            { label: '批量删除', code: 'document_batch_remove', subMenu: [], icon: 'delete', isCommonMethod: true },
            { label: '定型', code: 'document_appoint', subMenu: [], icon: 'swap-right', isCommonMethod: true },
            {
              label: '生命周期',
              subMenu: [
src/views/flowable/workflow/FlowTodo.vue
@@ -183,6 +183,11 @@
      :selectShenpiData='selectDispatchFileXqData'
      @searchReset='searchReset'
    ></DispatchFileHandle>
    <StandardizedProcessHandle
      ref='StandardizedProcessHandle'
      :selectShenpiData='selectDispatchFileXqData'
      @searchReset='searchReset'
    ></StandardizedProcessHandle>
    <DispatchFileBachHandleStyle
      ref='modalFormDispatchFileBatch'
      @ok='modalFormOk'
@@ -301,6 +306,7 @@
import lossBoundHandle from '@views/flowable/workflow/lossBound/lossBoundHandle.vue'
import InboundOrderHandle from '@views/flowable/workflow/inboundOrder/InboundOrderHandle.vue'
import SparePartApplyHandle from '@views/flowable/workflow/sparePartApply/SparePartApplyHandle.vue'
import StandardizedProcessHandle from '@views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue'
export default {
  name: 'NcDeviceCharactersList',
@@ -325,7 +331,8 @@
    InboundOrderHandle,
    EquipmentTransferApprovalModal,
    EquipmentScrapApprovalModal,
    SparePartApplyHandle
    SparePartApplyHandle,
    StandardizedProcessHandle
  },
  data() {
    return {
@@ -475,6 +482,9 @@
        case 'ggApproval':
          this.handDispatchFileDetial(item)
          break
        case 'standardized_approval':
          this.handStandardizedDetial(item)
          break
        case 'sbdjApproval':
          this.handInspectionOrder(item)
          break
@@ -570,6 +580,12 @@
      this.$refs.modalFormDispatchFileXq.clearTableSource()
      this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
    },
    //定型审批页面
    handStandardizedDetial(item){
      this.selectDispatchFileXqData = item
      this.$refs.StandardizedProcessHandle.clearTableSource()
      this.$refs.StandardizedProcessHandle.getAllApproveData(item)
    },
    handInspectionOrder(record) {
      console.log('record----->', record)
src/views/flowable/workflow/standardizedProcess/StandardizedProcessHandle.vue
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,413 @@
<!--
 Description: å·¥ä½œæµ-NC审签处理页面 List
 Author: ä½œè€… liuyh
 Date:   2025-02-27
-->
<template>
  <a-modal
    :title="title"
    :width="width"
    :visible="visible"
    :footer="null"
    @cancel="handCancel"
  >
    <a-card :bordered="false">
      <div>
        <b>{{ selectShenpiData.description }}</b>
        <br>
        <br>
        <a-tag color="blue">
          å½“前处理人 {{ selectShenpiData.assignee_dictText }}
        </a-tag>
        <a-tag color="blue">
          ä»»åŠ¡åˆ›å»ºæ—¶é—´ {{ selectShenpiData.createTime }}
        </a-tag>
        <br>
        <br>
        <button @click="fetchAndShowBmp" class="btn-custom">打开流程图</button>
        <div v-if="imageSrc">
          <img :src="imageSrc" alt="Fetched Image" />
        </div>
        <hr class="shallow-hr">
      </div>
      <div>
        <b>审签详情</b>
        <br>
        <a-form :form='form'>
          <a-spin :spinning="spinning">
            <a-tabs default-active-key='1' @change='callback'>
              <a-tab-pane key='1' tab='基本信息'>
                <a-form-model ref='form' :model='tableRowRecord' :rules='validatorRules'>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item label='文档名称' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docName'>
                        <a-input :disabled='coldisabled' v-model='tableRowRecord.docName'></a-input>
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label='文档版本' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='publishVersion'>
                        <a-input :disabled='coldisabled' v-model='tableRowRecord.publishVersion'></a-input>
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item label='文档后缀' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docSuffix'>
                        <a-input :disabled='coldisabled' v-model='tableRowRecord.docSuffix'></a-input>
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label='系统指定版本' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='componentId'>
                        <a-input :disabled='coldisabled' v-model='tableRowRecord.componentName'></a-input>
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                  <a-row>
                    <a-col :span='span'>
                      <a-form-model-item label='出库状态' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
                        <a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></a-input>
                      </a-form-model-item>
                    </a-col>
                    <a-col :span='span'>
                      <a-form-model-item label='出库人' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullUser_dictText'>
                        <a-input :disabled='coldisabled' v-model='tableRowRecord.pullUser_dictText'></a-input>
                      </a-form-model-item>
                    </a-col>
                  </a-row>
                </a-form-model>
              </a-tab-pane>
              <a-tab-pane key='2' tab='流程节点'>
                <a-card>
                  <a-timeline style="padding:0 1% 0 12%" >
                    <a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
                      <div class="bottom">
                        <p>处理人:{{item.assignee_dictText}}</p>
                        <p v-if="index1 !==0">处理时长:{{item.duration}}</p>
                        <p v-if="item.name !== '提交申请'">处理类型:{{item.sequenceFlowName}}</p>
                        <p v-if="item.description != null">处理意见:{{item.description}}</p>
                        <div class="left_qiu"><span>{{item.taskName}}</span></div>
                      </div>
                    </a-timeline-item>
                  </a-timeline>
                </a-card>
              </a-tab-pane>
            </a-tabs>
          </a-spin>
        </a-form>
      </div>
      <div>
        <hr class="shallow-hr">
        <br>
        <b>审批详情</b>
        <br>
        <a-form-model ref="form" :model="approveData" :rules="validatorRules" slot="detail">
          <a-row>
            <a-col ::span='span' v-if="selectShenpiData.taskDefKey ==='task_proofread'" class="btxx">
              <a-form-model-item  label="处理类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop='status'>
                <j-dict-select-tag  type='list' v-model='assignFileStream.status' dictCode='nc_sq_handle_type_jd' placeholder="请选择处理类型"  />
              </a-form-model-item >
            </a-col>
            <a-col ::span='span' v-if="selectShenpiData.taskDefKey ==='task_approve' || selectShenpiData.taskDefKey ==='Activity_0ocot6b'|| selectShenpiData.taskDefKey ==='task_cut' || selectShenpiData.taskDefKey ==='task_finalize'" class="btxx">
              <a-form-model-item  label="处理类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop='status'>
                <j-dict-select-tag  type='list' v-model='assignFileStream.status' dictCode='nc_sq_handle_type' placeholder="请选择处理类型"  />
              </a-form-model-item >
            </a-col>
            <a-col :span="24" class="btxx">
              <a-form-model-item  label="处理意见" :labelCol="labelCol" :wrapperCol="wrapperCol">
                <a-textarea v-model="assignFileStream.approveContent" rows="4" placeholder="请输入处理意见"/>
              </a-form-model-item >
            </a-col>
          </a-row>
          <div class="table-operator" style="text-align: right;">
            <a-button  @click="handleQueXiaoTask" type="primary" icon="close">取消</a-button>
            <a-button @click="submitForm">提 äº¤</a-button>
          </div>
        </a-form-model>
      </div>
    </a-card>
  </a-modal>
</template>
<script>
import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
export default {
  name: 'FlowShenPi',
  mixins: [mixinDevice],
  props: {
    selectShenpiData: {
      type: Object,
      required: true
    }
  },
  data() {
    return {
      form: this.$form.createForm(this),
      span: 12,
      span1: 8,
      coldisabled: true,
      spinning: false,
      tableRowRecord: {},
      assignFileStream:{},
      tableDataSource: [],
      usageDataSource: [],
      hitaskDataSource:[],
      bomForm: {},
      approveContent:"",
      imageSrc: null,
      drawerVisible: true,
      labelCol: {
        xs: { span: 24 },
        sm: { span: 5 }
      },
      wrapperCol: {
        xs: { span: 30 },
        sm: { span: 16 }
      },
      validatorRules: {
        status: {
          rules: [
            { required: true, message: '请选择审批状态!'},
          ]
        },
      },
      approveData: {},
      flowData: {},
      title: '详情页面',
      width: 1000,
      visible: false,
      // è¡¨å¤´
      url: {
        diagramView: '/assign/flow/diagramView',
        queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
        approve:"/dncFlow/dispatchFile/approval",
        saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile",
        queryDocInfoByFlowDataId:'/dncFlow/dispatchFile/queryDocInfoByFlowDataId'
      },
      dictOptions: {},
      superFieldList: [],
      workflowSource: []
    }
  },
  created() {
  },
  computed: {},
  methods: {
    callback() {
    },
    handCancel() {
      this.visible = false
    },
    clearTableSource() {
      this.tableDataSource = []
      this.usageDataSource = []
    },
    fetchAndShowBmp() {
      console.log('flowData----->', this.flowData)
      try {
        let parm = {
          processDefinitionId: this.flowData.processDefinitionId,
          processInstanceId:this.flowData.processInstanceId,
          TaskDefinitionKey:this.flowData.processDefinitionKey
        }
        downFile(this.url.diagramView,parm,'get').then((res=>{
          console.log('Pica------>',res)
          const urlObject = window.URL.createObjectURL(new Blob([res]))
          this.imageSrc = urlObject
        }))
      } catch (error) {
        console.error('Error fetching image blob:', error)
        alert('无法加载图片,请稍后再试。')
      }
    },
    handleQueXiaoTask(){
      this.visible = false
      this.routeReload()
    },
    submitForm () {
      const that = this;
      console.log('selectShenpiData---->',that.selectShenpiData)
      if (that.selectShenpiData.taskDefKey ==='task_prepare'){
        // è§¦å‘表单验证-重新启动
        this.form.validateFields((err, values) => {
          if (!err) {
            that.confirmLoading = true;
            let url=this.url.saveDispatchFile;
            let method = 'post';
            let flowTaskVo = {}
            flowTaskVo.comment =that.assignFileStream.approveContent;
            flowTaskVo.dataId = this.selectShenpiData.dataId
            flowTaskVo.instanceId = this.selectShenpiData.procInstId
            flowTaskVo.taskId = this.selectShenpiData.id
            console.log("表单提交数据",flowTaskVo)
            httpAction(url,flowTaskVo,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.visible = false
                //刷新表格
                that.$emit('searchReset')
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
            })
          }
        })
        //跳出方法
        return false;
      }else {
        if (!that.assignFileStream.status==null || that.assignFileStream.status===undefined){
          this.$message.warning('请选择处理类型!')
          return false;
        }
      }
      if (!that.assignFileStream.approveContent==null || that.assignFileStream.approveContent===undefined) {
        this.$message.warning('请输入处理意见!')
        return false;
      }
      // è§¦å‘表单验证
      this.form.validateFields((err, values) => {
        if (!err) {
          that.confirmLoading = true;
          let url=this.url.approve
          let method = 'post';
          let handle =that.assignFileStream.status === '1';
          let flowTaskVo = {}
          switch (that.selectShenpiData.taskDefKey){
            case "task_approve":
              flowTaskVo.ratify=handle;
              break;
            case "task_cut":
              flowTaskVo.cut=handle;
              break;
            case "task_finalize":
              flowTaskVo.stereotype=handle;
              break;
          }
          if (that.selectShenpiData.taskDefKey ==='task_proofread'){
            flowTaskVo.proofreadStatus =that.assignFileStream.status;
          }
          flowTaskVo.comment =that.assignFileStream.approveContent;
          flowTaskVo.dataId = this.selectShenpiData.dataId
          flowTaskVo.taskId = this.selectShenpiData.id
          flowTaskVo.userId = this.selectShenpiData.assignee
          flowTaskVo.instanceId = this.selectShenpiData.procInstId
          flowTaskVo.values = this.selectShenpiData.variables
          console.log("表单提交数据",flowTaskVo)
          httpAction(url,flowTaskVo,method).then((res)=>{
            if(res.success){
              that.$message.success(res.message);
              that.visible = false
              //刷新表格
              that.$emit('searchReset')
            }else{
              that.$message.warning(res.message);
            }
          }).finally(() => {
            that.confirmLoading = false;
          })
        }
      })
    },
    async getAllApproveData(item) {
      console.log('selectShenpiData----->', this.selectShenpiData)
      this.flowData = item
      let param = {
        'dataId': item.dataId
      }
      let parmhis={
        'procInstId': item.procInstId
      }
      const hitaskDataList = await getAction(this.url.queryHisTaskList,parmhis)
      if(hitaskDataList.success){
        this.hitaskDataSource=hitaskDataList.result
      }
      const docInforResult = await getAction(this.url.queryDocInfoByFlowDataId,param)
      if(docInforResult.success){
        this.tableRowRecord = docInforResult.result
        this.visible=true
      }
    }
  }
}
</script>
<style scoped>
.shallow-hr {
  border: 0;
  height: 1px; /* åˆ†ç•Œçº¿çš„高度 */
  background-color: rgba(0, 0, 0, 0.1); /* ä½¿ç”¨ RGBA é¢œè‰²ï¼Œå¹¶è®¾ç½®è¾ƒä½Žçš„透明度 */
  margin: 20px 0; /* åˆ†ç•Œçº¿ä¸Šä¸‹çš„外边距 */
}
.btn-custom {
  background-color: #4CAF50; /* ç»¿è‰²èƒŒæ™¯ */
  color: white; /* ç™½è‰²æ–‡å­— */
  border: none; /* æ— è¾¹æ¡† */
  padding: 5px 15px; /* å†…边距 */
  text-align: center; /* æ–‡å­—居中 */
  text-decoration: none; /* æ— ä¸‹åˆ’线 */
  display: inline-block; /* è¡Œå†…块元素 */
  font-size: 12px; /* å­—体大小 */
  margin: 4px 2px; /* å¤–边距 */
  cursor: pointer; /* é¼ æ ‡æ‚¬åœæ—¶æ˜¾ç¤ºæ‰‹åž‹ */
  border-radius: 4px; /* åœ†è§’边框 */
}
.bold-large-label {
  font-weight: bold;
  font-size: 20px; /* æˆ–你需要的任何大小 */
}
.left_qiu{
  position: absolute;
  left: -74px;
  top: 0;
  width:54px;
  border-radius: 50%;
  height:54px;
  font-size: 13px;
  margin: auto;
  display: flex;
  flex-wrap: wrap;
  align-items: center;
  justify-content: center;
  background: #0099ff;
  transform: translate(0, 0);
}
/deep/ .ant-timeline-item-tail{
  left: -29px !important;
}
.left_qiu span{
  width: 3em;
  display: block;
  color: #fff;
  text-align: center;
}
.img{
  width: 75%;
}
.wrap{
  clear: both;
  width: 100%;
  display: flex;
  height: 50px;
  border: 1px solid #ccc;
  /* background-color: aqua; */
}
.box{
  width:21%;
  height:50px;
  border-right: 1px solid #ccc;
  line-height: 50px;
  /* background: red; */
  text-align:center;
  margin: auto;
}
@import '~@assets/less/common.less';
</style>
src/views/tms/modules/baseTools/BaseToolsListRight.vue
@@ -482,50 +482,32 @@
              this.$refs.paraCommonToolModal.edit(record);
              this.$refs.paraCommonToolModal.title="详情";
              this.$refs.paraCommonToolModal.disableSubmit = true;
              this.$refs.paraCommonToolModal.disSeach = true;
              if(this.$refs.paraCommonToolModal.removeValidate) {
                this.$refs.paraCommonToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "2"){
              this.$refs.paraHoleToolsModal.edit(record);
              this.$refs.paraHoleToolsModal.title="详情";
              this.$refs.paraHoleToolsModal.disableSubmit = true;
              this.$refs.paraHoleToolsModal.disSeach = true;
              if(this.$refs.paraHoleToolsModal.removeValidate) {
                this.$refs.paraHoleToolsModal.removeValidate()
              }
            }else if(record.paramaTableName === "3"){
               this.$refs.paraThreadingToolModal.edit(record);
              this.$refs.paraThreadingToolModal.title="详情";
              this.$refs.paraThreadingToolModal.disableSubmit = true;
              this.$refs.paraThreadingToolModal.disSeach = true;
              if(this.$refs.paraThreadingToolModal.removeValidate) {
                this.$refs.paraThreadingToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "4"){
               this.$refs.paraMillToolModal.edit(record);
              this.$refs.paraMillToolModal.title="详情";
              this.$refs.paraMillToolModal.disableSubmit = true;
              this.$refs.paraMillToolModal.disSeach = true;
              if(this.$refs.paraMillToolModal.removeValidate) {
                this.$refs.paraMillToolModal.removeValidate()
              }
            }else if(record.paramaTableName === "5"){
               this.$refs.paraTurningToolsModal.edit(record);
              this.$refs.paraTurningToolsModal.title="详情";
              this.$refs.paraTurningToolsModal.disableSubmit = true;
              this.$refs.paraTurningToolsModal.disSeach = true;
              if(this.$refs.paraTurningToolsModal.removeValidate) {
                this.$refs.paraTurningToolsModal.removeValidate()
              }
            }else if(record.paramaTableName === "6"){
               this.$refs.paraBladeModal.edit(record);
              this.$refs.paraBladeModal.title="详情";
              this.$refs.paraBladeModal.disableSubmit = true;
              this.$refs.paraBladeModal.disSeach = true;
              if(this.$refs.paraBladeModal.removeValidate) {
                this.$refs.paraBladeModal.removeValidate()
              }
            }
    },
      //禁用状态样式
src/views/tms/modules/outBound/OutboundDetailSelectList.vue
@@ -14,6 +14,26 @@
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
        @change="handleTableChange">
        <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
        <div :key="col.dataIndex">
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.accuracyClass != '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.accuracyClass != '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
        </div>
      </template>
        <span slot="action" slot-scope="text, record">
          <a @click="handleOutbound(record)">出库</a>
        </span>
@@ -100,6 +120,18 @@
            title:'申请出库数量',
            align:"left",
            dataIndex: 'outboundQuantity'
          },
          {
          title:'额定寿命',
          align:"center",
          dataIndex: 'ratedLife',
          scopedSlots: { customRender: 'ratedLife' },
        },
        {
          title:'使用寿命',
          align:"center",
          dataIndex: 'useLife',
          scopedSlots: { customRender: 'useLife' },
          },
          // {
          //   title:'已出库数量',
@@ -193,7 +225,9 @@
          {
            outBoundOrderId: this.mainId,
            outboundDetailId: record.id,
            outboundQuantity: record.outboundQuantity
            outboundQuantity: record.outboundQuantity,
            ratedLife:record.ratedLife,
            useLife:record.useLife
          }
        ]
        postAction(this.url.outbound, params).then(res=>{
@@ -205,7 +239,17 @@
            this.$message
          }
        })
      },
      handleChange(value, key, column, index) {
        console.log(value, key, column, index)
        const temp = [...this.dataSource]
        const target = temp.filter(item => key === item.key)[index];
        if (target) {
          target[column.dataIndex] = value
          this.dataSource = temp
      }
      },
    }
  }
src/views/tms/modules/outBound/OutboundModal.vue
@@ -51,7 +51,21 @@
        <div :key="col.dataIndex">
          <a-input-number
            v-if="col.dataIndex === 'outboundQuantity'"
            :disabled="record.quantity <= 1"
            :disabled="record.accuracyClass === '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.accuracyClass != '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.accuracyClass != '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
@@ -162,6 +176,18 @@
          align:"center",
          dataIndex: 'outboundLocation'
        },
        {
          title:'额定寿命',
          align:"center",
          dataIndex: 'ratedLife',
          scopedSlots: { customRender: 'ratedLife' },
        },
        {
          title:'使用寿命',
          align:"center",
          dataIndex: 'useLife',
          scopedSlots: { customRender: 'useLife' },
        },
        // {
        //   title:'出库状态;1.未出库;2.部分出库;3.出库完成',
        //   align:"center",
@@ -208,7 +234,8 @@
          outboundQuantity: data[i].quantity,
          storageLocation: data[i].warehouseId,
          warehouseName: data[i].warehouseName,
          outboundLocation: data[i].positionCode
          outboundLocation: data[i].positionCode,
          accuracyClass:data[i].accuracyClass
        })
      }
      this.ipagination.total = this.dataSource.length
@@ -302,7 +329,9 @@
              toolId: item.toolId,
              outboundQuantity: item.outboundQuantity,
              outStorehouseType: this.model.outStorehouseType,
              storageLocation: item.storageLocation
              storageLocation: item.storageLocation,
              ratedLife:item.ratedLife,
              useLife:item.useLife
            }
          })
          this.confirmLoading = true;
src/views/tms/modules/outBound/OutboundOrderModal.vue
@@ -142,7 +142,22 @@
        <div :key="col.dataIndex">
          <a-input-number
            v-if="col.dataIndex === 'outboundQuantity'"
            :disabled="record.quantity <= 1"
            :disabled="record.accuracyClass === '1'"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'ratedLife'"
            :disabled="record.quantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
          />
          <a-input-number
            v-if="col.dataIndex === 'useLife'"
            :disabled="record.quantity > 1"
            :value="text"
            @change="(e) => handleChange(e, record.key, col, index)"
            :min="1"
@@ -255,6 +270,18 @@
            dataIndex: 'outboundLocation'
          },
          // {
        //   title:'额定寿命',
        //   align:"center",
        //   dataIndex: 'ratedLife',
        //   scopedSlots: { customRender: 'ratedLife' },
        // },
        // {
        //   title:'使用寿命',
        //   align:"center",
        //   dataIndex: 'useLife',
        //   scopedSlots: { customRender: 'useLife' },
        // },
          // {
          //   title:'出库状态;1.未出库;2.部分出库;3.出库完成',
          //   align:"center",
          //   dataIndex: 'status'
@@ -307,7 +334,8 @@
            outboundQuantity: data[i].quantity,
            storageLocation: data[i].warehouseId,
            warehouseName: data[i].warehouseName,
            outboundLocation: data[i].positionCode
            outboundLocation: data[i].positionCode,
            accuracyClass:data[i].accuracyClass
          })
        }
        this.ipagination.total = this.dataSource.length
src/views/tms/modules/outBound/OutboundOrderSelectList.vue
@@ -256,7 +256,9 @@
          return {
            outBoundOrderId: this.selectedMainId,
            outboundDetailId: item.id,
            outboundQuantity: item.outboundQuantity
            outboundQuantity: item.outboundQuantity,
            ratedLife:item.ratedLife,
            useLife:item.useLife
          }
        })
        postAction(this.url.outbound, params).then(res=>{
src/views/tms/requirement/ToolSharpeningList .vue
@@ -131,12 +131,11 @@
          align:"center",
          dataIndex: 'toolId'
        },
        {
          title:'刀具名称',
          align:"center",
          dataIndex: 'typeName'
        },
        // {
        //   title:'刀具名称',
        //   align:"center",
        //   dataIndex: 'typeName'
        // },
        {
          title:'厂家',
          align:"center",
src/views/tms/requirement/modules/ToolsSharpeningModal.vue
@@ -122,12 +122,11 @@
</template>
<script>
import { getAction, postAction, requestPut } from '@/api/manage'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import ToolsModal from '@views/tms/requirement/modules/ToolsModal.vue'
import pick from 'lodash.pick'
import DeviceListModel from '@views/mdc/base/modules/EquipmentList/DeviceListModal.vue'
import { requestPut, postAction, httpAction } from '@/api/manage'
export default {
  name: 'ToolsSharpeningModal',
  mixins: [JVxeTableModelMixin],
@@ -167,8 +166,7 @@
      lastSelectionData: null,
      url: {
        add: '/tms/toolSharpening/add',
        edit: '/tms/toolSharpening/edit',
        // queryDetailList: '/tms/toolSharpening/listToolSharpening'
        edit: '/tms/toolSharpening/edit'
      }
    }
  },
@@ -205,61 +203,78 @@
      let that = this
      that.visible = true
      that.model = Object.assign({}, record)
      // this.$nextTick(() => {
      //   this.form.setFieldsValue(pick(that.model, 'selectedDeparts', 'selectedProduction', 'equipmentId', 'equipmentName', 'equipmentModel', 'equipmentType', 'equipmentIp', 'dataPort',
      //     'driveType', 'sortNo', 'remark', 'systemVersion', 'devicePower', 'controlSystem', 'saveTableName', 'systemValue'))
      // })
    },
    // edit(record) {
    //   let that = this
    //   that.visible = true
    //   that.model = Object.assign({}, record)
    //
    //   // å¦‚果有 selectionRows æ•°æ®ï¼Œåˆ™é‡æ–°èµ‹å€¼
    //   if (this.lastSelectionData && this.lastSelectionData.length > 0) {
    //     this.assignModelFromSelection(this.lastSelectionData[0])
    //     console.log('this.model',this.assignModelFromSelection(this.lastSelectionData[0]))
    //   }
    // },
    close() {
      this.$emit('close')
      this.visible = false
    },
    handleOk() {
      const that = this
      that.confirmLoading = true
      // âœ… è§¦å‘表单验证
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          let formData = Object.assign(this.model)
          let obj
          that.confirmLoading = true
          let httpurl = ''
          let method = ''
          if (!this.model.id) {
            obj = postAction(this.url.add, formData)
            httpurl += this.url.add
            method = 'post'
          } else {
            obj = requestPut(this.url.edit, formData, { id: this.model.id })
            httpurl += this.url.edit
            method = 'put'
          }
          obj.then((res) => {
          httpAction(httpurl, this.model, method,formData).then((res) => {
            if (res.success) {
              that.$message.success(res.message)
              that.$emit('ok')
              that.close()
            } else {
              that.$message.warning(res.message)
            }
          }).finally(() => {
            that.confirmLoading = false
            that.close()
          })
        } else {
          that.$message.warning('请填写必填字段')
          that.confirmLoading = false
          return false
        }
      })
    },
    // handleOk() {
    //   const that = this
    //   that.confirmLoading = true
    //
    //   // âœ… è§¦å‘表单验证
    //   this.$refs.form.validate(valid => {
    //     if (valid) {
    //       let formData = Object.assign(this.model)
    //
    //       let obj
    //       if (!this.model.id) {
    //         obj = postAction(this.url.add, formData)
    //       } else {
    //         obj = requestPut(this.url.edit, formData, { id: this.model.id })
    //       }
    //
    //       obj.then((res) => {
    //         if (res.success) {
    //           that.$message.success(res.message)
    //           that.$emit('ok')
    //           that.close()
    //         } else {
    //           that.$message.warning(res.message)
    //         }
    //       }).finally(() => {
    //         that.confirmLoading = false
    //       })
    //     } else {
    //       that.$message.warning('请填写必填字段')
    //       that.confirmLoading = false
    //       return false
    //     }
    //   })
    // },
    handleCancel() {
      this.close()
src/views/tms/stocktakingBound/ToolsStocktaKingBoundDetail.vue
@@ -61,8 +61,8 @@
        {
          title: '刀具编号',
          dataIndex: 'toolCode',
          title: '刀具编码',
          dataIndex: 'toolId',
          align: 'center'
        },
        {
src/views/tms/stocktakingBound/modules/ToolSelectorModal.vue
@@ -54,17 +54,20 @@
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode'
          dataIndex: 'toolId',
          width: 200
        },
        {
          title: '中文名称',
          align: 'center',
          dataIndex: 'chineseName'
          dataIndex: 'chineseName',
          width: 150
        },
        {
          title: '型号/图号',
          align: 'center',
          dataIndex: 'toolModel'
          dataIndex: 'toolModel',
          width: 150
        }
      ],
      selectedRowKeys: [],
src/views/tms/stocktakingBound/modules/ToolsStocktakingBoundModal.vue
@@ -169,14 +169,14 @@
        },
        {
          title: '刀具编号',
          dataIndex: 'toolCode',
          dataIndex: 'toolId',
          align: 'center',
          width: 150
          width: 180
        },
        {
          title: '工具类型',
          dataIndex: 'applicationType',
          dataIndex: 'applicationType_dictText',
          align: 'center',
          width: 150
        },
@@ -327,11 +327,12 @@
    this.$bus.$on('selectionRows', (data) => {
      for (let i = 0; i < data.length; i++) {
        this.dataSource.push({
          toolId: data[i].id,
          toolId: data[i].toolId,
          toolCode: data[i].toolCode,
          classifyId: data[i].classifyId,
          applicationType: data[i].applicationType_dictText,
          applicationType_dictText: data[i].applicationType_dictText,
          chineseName: data[i].chineseName,
          availableQuantity:data[i].availableCount,
          toolModel: data[i].toolModel,
          material: data[i].material,
          toolMaterial: data[i].toolMaterial,