Merge remote-tracking branch 'origin/master'

zhaowei

2025-06-13 91678e5bf6c81ab5da30e8c2cb713b6e57ee229f

Merge remote-tracking branch 'origin/master'

 src/views/mdc/base/EfficiencyPunchReport.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,216 @@
<template>
  <a-card :bordered="false">

    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="记录时间">
              <a-date-picker format="YYYY-MM-DD" :allowClear="false" v-model="queryParam.theDate"
                             @change="dateParamChange"></a-date-picker>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="班次">
              <j-dict-select-tag v-model="queryParam.shiftSchedule" dictCode="shift_schedule"
                                 placeholder="请选择班次"></j-dict-select-tag>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="info" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
      <a-button type="primary" icon="download" @click="handleExportXls('设备打卡率报表')">导出</a-button>

    </div>

    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a
        style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
          <a @click="handleDetail(record)">详情</a>
        </span>
      </a-table>
    </div>
    <!-- table区域-end -->
    <efficiency-punch-report-modal ref="modalForm" @ok="modalFormOk"></efficiency-punch-report-modal>
  </a-card>
</template>

<script>
import '@/assets/less/TableExpand.less'

import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import EfficiencyPunchReportModal from '@views/mdc/base/modules/EfficiencyPunchReport/EfficiencyPunchReportModal.vue'

export default {
  name: 'EfficiencyPunchReport',
  mixins: [JeecgListMixin],
  components: {
    EfficiencyPunchReportModal
  },
  data() {
    return {
      queryParam: {
        theDate: this.formatDate(new Date(new Date().setDate(new Date().getDate() - 1))), // é»˜è®¤è®¾ç½®ä¸ºæ˜¨å¤©
        shiftSchedule: ''
      },

      dataSource: [], // ç¡®ä¿åˆå§‹åŒ–为空数组
      description: '设备打卡率',
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        },

        {
          title: '记录时间',
          align: 'center',
          dataIndex: 'theDate'
        },
        {
          title: '班次',
          align: 'center',
          dataIndex: 'shiftSchedule_dictText'
        },

        {
          title: '早班上班打卡设备数量',
          align: 'center',
          dataIndex: 'mornShiftInNum'
        },
        {
          title: '早下班打卡设备数量',
          align: 'center',
          dataIndex: 'mornShiftOutNum'
        },
        {
          title: '晚班上班打卡设备数量',
          align: 'center',
          dataIndex: 'evenShiftInNum'
        },
        {
          title: '晚班下班打卡设备数量',
          align: 'center',
          dataIndex: 'evenShiftOutNum'
        },
        {
          title: '设备总数',
          align: 'center',
          dataIndex: 'deviceCountNum'
        },
        {
          title: '早班上班打卡率(%)',
          align: 'center',
          dataIndex: 'mornShiftInRate'
        },
        {
          title: '早班下班打卡率(%)',
          align: 'center',
          dataIndex: 'mornShiftOutRate'

        },
        {
          title: '晚班上班打卡率(%)',
          align: 'center',
          dataIndex: 'evenShiftInRate',
          customRender: (text) => {
            if (text !== null && text !== undefined) {
              return parseFloat(text).toFixed(2);
            }
            return text;
          }
        },
        {
          title: '晚班下班打卡率(%)',
          align: 'center',
          dataIndex: 'evenShiftOutRate'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/mdcEquipmentPunchRate/queryPageList',
        exportXlsUrl: '/mdcEquipmentPunchRate/exportXls'
      }
    }
  },
  methods: {
    searchQuery() {
      if (this.queryParam.theDate) {
        // ç¡®ä¿ queryParam.recordDate æ˜¯ä¸€ä¸ªæœ‰æ•ˆçš„ Date å¯¹è±¡
        const date = new Date(this.queryParam.recordDate)
        if (!isNaN(date.getTime())) { // æ£€æŸ¥æ˜¯å¦ä¸ºæœ‰æ•ˆæ—¥æœŸ
          const formattedDate = this.formatDate(date)
          this.queryParam.theDate = formattedDate
          console.log('Formatted theDate:', this.queryParam.theDate) // éªŒè¯æ ¼å¼
        } else {
          console.error('Invalid date format')
        }
      }

      this.loadData()
    },

    formatDate(date) {
      const year = date.getFullYear()
      const month = String(date.getMonth() + 1).padStart(2, '0')
      const day = String(date.getDate()).padStart(2, '0')
      return `${year}${month}${day}`
    },

    dateParamChange(value) {
      // value æ˜¯ä¸€ä¸ªæ—¶åˆ»å¯¹è±¡ï¼ˆmoment object），需要转换为 Date å¯¹è±¡
      if (value) {
        const date = value.toDate() // è½¬æ¢ä¸º Date å¯¹è±¡
        const formattedDate = this.formatDate(date)
        this.queryParam.theDate = formattedDate
      } else {
        this.queryParam.theDate = null
      }
    }

  }
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

 src/views/mdc/base/modules/EfficiencyPunchReport/EfficiencyPunchReportModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,214 @@
<template>
  <a-modal :title="title" :width="1500" :height="1500" :visible="visible" :maskClosable="false"
           cancelText="关闭"
           @cancel="handleCancel" :confirmLoading="confirmLoading">

    <a-spin :spinning="confirmLoading">
      <a-form :form="form">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="记录日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="theDate">
              <a-input :disabled="true" v-model="model.theDate" placeholder="请输入记录日期"></a-input>
            </a-form-model-item>
          </a-col>

          <a-col :span="12">
            <a-form-model-item label="班次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shiftSchedule">
              <j-dict-select-tag dictCode="shift_schedule" placeholder="请选择班次" v-model="model.shiftSchedule"
                                 :disabled="disableSubmit" />
            </a-form-model-item>
          </a-col>

          <a-col :span="12">
            <a-form-model-item  label="早班上班打卡率" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="mornShiftInRate">
              <a-input v-model="model.mornShiftInRate" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item  label="早班下班打卡率" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                prop="mornShiftOutRate">
              <a-input v-model="model.mornShiftOutRate" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item  label="晚班上班打卡率" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="evenShiftInRate">
              <a-input v-model="model.evenShiftInRate" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="晚班下班打卡率" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="evenShiftOutRate">
              <a-input v-model="model.evenShiftOutRate" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="早班上班打卡设备数量" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="mornShiftInDeviceNum">
              <a-input v-model="model.mornShiftInNum" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="早下班打卡设备数量" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="mornShiftOutNum">
              <a-input v-model="model.mornShiftOutNum" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="晚班上班打卡设备数量" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="evenShiftInNum">
              <a-input v-model="model.evenShiftInNum" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="晚下班打卡设备数量" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="evenShiftOutNum">
              <a-input v-model="model.evenShiftOutNum" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item v-show="addShow" label="设备总数" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="deviceCountNum">
              <a-input v-model="model.deviceCountNum" placeholder="请输入"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form>
    </a-spin>

    <template slot="footer">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel()">
        å…³é—­
      </a-button>

<!--      <a-button @click="handleOk()" :disabled="disableSubmit" type="primary" :loading="confirmLoading">确定</a-button>-->
    </template>
  </a-modal>

</template>

<script>
import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
import Tooltip from 'ant-design-vue/es/tooltip'

export default {
  name: 'EfficiencyPunchReportModal',
  components: {
    JMultiSelectTag,
    Tooltip
  },
  data() {

    return {
      addShow: true,
      model: {},
      formDisabled: false,
      pagination: {
        current: 1,
        pageSize: 10,
        total: 0
      },

      title: '操作',
      visible: false,
      disableSubmit: false,
      codeDisable: true,

      labelCol: {
        xs: { span: 24 },
        sm: { span: 6 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 18 }
      },
      confirmLoading: false,
      form: this.$form.createForm(this),
      validatorRules: {
        // orderCode: [
        //   { required: true, message: '请输入盘点单号!' }
        // ],
        // handler: [
        //   { required: true, message: '请输入经手人!' }
        // ],
        // stocktakingName: [
        //   { required: true, message: '请输入盘点名称!' }
        // ],
        // approvalStatus: [
        //   { required: true, message: '请输入审核状态!' }
        // ],
        // inventoryTime: [
        //   { required: true, message: '请输入盘点时间!' }
        // ]
      },
      url: {



      },
      dataSource: []
    }
  },

  mounted() {

  },

  methods: {

    add() {
      this.addShow = false
      this.edit()
    },

    edit(record) {
      this.model = Object.assign({}, record)
      this.visible = true
    },



    close() {
      this.$emit('close')
      this.visible = false
    },

    handleCancel() {
      this.model = {}
      this.dataSource = []
      this.close()
    },
  }

}
</script>

<style lang="less" scoped>
.frozenRowClass {
  color: #c9c9c9;
}

.fontweight {
  font-weight: bold;
}

.ant-btn {
  padding: 0 10px;
  margin-left: 3px;
}

.ant-form-item-control {
  line-height: 0px;
}

/** ä¸»è¡¨å•è¡Œé—´è· */
.ant-form .ant-form-item {
  margin-bottom: 10px;
}

/** Tab页面行间距 */
.ant-tabs-content .ant-form-item {
  margin-bottom: 0px;
}
</style>

 src/views/tms/PreparationOrderDetailList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,205 @@
<template>
  <a-card :bordered="false" :class="'cust-erp-sub-tab'">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
        </a-row>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
<!--    <div class="table-operator" v-if="mainId">-->
<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
<!--      <a-button type="primary" icon="download" @click="handleExportXls('刀具准备单明细')">导出</a-button>-->
<!--      <a-upload-->
<!--        name="file"-->
<!--        :showUploadList="false"-->
<!--        :multiple="false"-->
<!--        :headers="tokenHeader"-->
<!--        :action="importExcelUrl"-->
<!--        @change="handleImportExcel">-->
<!--          <a-button type="primary" icon="import">导入</a-button>-->
<!--      </a-upload>-->
<!--      <a-dropdown v-if="selectedRowKeys.length > 0">-->
<!--        <a-menu slot="overlay">-->
<!--          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>-->
<!--        </a-menu>-->
<!--        <a-button style="margin-left: 8px"> æ‰¹é‡æ“ä½œ <a-icon type="down" /></a-button>-->
<!--      </a-dropdown>-->
<!--    </div>-->

    <!-- table区域-begin -->
    <div>
<!--      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">-->
<!--        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项-->
<!--        <a style="margin-left: 24px" @click="onClearSelected">清空</a>-->
<!--      </div>-->

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :scroll="{x:true}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="null"
        @change="handleTableChange">

<!--        <template slot="htmlSlot" slot-scope="text">-->
<!--          <div v-html="text"></div>-->
<!--        </template>-->
<!--        <template slot="imgSlot" slot-scope="text,record">-->
<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
<!--          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
<!--        </template>-->
<!--        <template slot="fileSlot" slot-scope="text">-->
<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
<!--          <a-button-->
<!--            v-else-->
<!--            :ghost="true"-->
<!--            type="primary"-->
<!--            icon="download"-->
<!--            size="small"-->
<!--            @click="downloadFile(text)">-->
<!--            ä¸‹è½½-->
<!--          </a-button>-->
<!--        </template>-->

<!--        <span slot="action" slot-scope="text, record">-->
<!--          <a @click="handleEdit(record)">编辑</a>-->
<!--          <a-divider type="vertical" />-->
<!--          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!--            <a>删除</a>-->
<!--          </a-popconfirm>-->
<!--        </span>-->

      </a-table>
    </div>

    <preparationOrderDetail-modal ref="modalForm" @ok="modalFormOk" :mainId="mainId"></preparationOrderDetail-modal>
  </a-card>
</template>

<script>

  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import PreparationOrderDetailModal from './modules/preparationOrder/PreparationOrderDetailModal'

  export default {
    name: "PreparationOrderDetailList",
    mixins:[JeecgListMixin],
    components: { PreparationOrderDetailModal },
    props:{
      mainId:{
        type:String,
        default:'',
        required:false
      }
    },
    watch:{
      mainId:{
        immediate: true,
        handler(val) {
          if(!this.mainId){
            this.clearList()
          }else{
            this.queryParam['preparationOrderId'] = val
            this.loadData(1);
          }
        }
      }
    },
    data () {
      return {
        description: '刀具准备单管理页面',
        disableMixinCreated:true,
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'工具编码',
            align:"left",
            dataIndex: 'toolNum'
          },
          {
            title:'工具类型',
            align:"center",
            dataIndex: 'applicationType_dictText'
          },
          {
            title:'中文名称',
            align:"center",
            dataIndex: 'chineseName'
          },
          {
            title:'型号/图号',
            align:"left",
            dataIndex: 'toolModel'
          },
          {
            title:'刀具材料',
            align:"center",
            dataIndex: 'toolMaterial'
          },
          {
            title:'零件材料',
            align:"center",
            dataIndex: 'partMaterial'
          },
          {
            title:'厂家',
            align:"center",
            dataIndex: 'supplierId'
          },
          {
            title:'出库数量',
            align:"left",
            dataIndex: 'outboundQuantity',
            scopedSlots: { customRender: 'outboundQuantity' }
          }
        ],
        url: {
          list: "/tms/preparationOrder/listPreparationOrderDetailByMainId",
          delete: "/tms/preparationOrder/deletePreparationOrderDetail",
          deleteBatch: "/tms/preparationOrder/deleteBatchPreparationOrderDetail",
          exportXlsUrl: "/tms/preparationOrder/exportPreparationOrderDetail",
          importUrl: "/tms/preparationOrder/importPreparationOrderDetail",
        },
        dictOptions:{
        }
      }
    },
    created() {
    },
    computed: {
      importExcelUrl(){
        return `${window._CONFIG['domianURL']}/${this.url.importUrl}/${this.mainId}`;
      }
    },
    methods: {
      clearList(){
        this.dataSource=[]
        this.selectedRowKeys=[]
        this.ipagination.current = 1
      }

    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less'
</style>

 src/views/tms/PreparationOrderList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,363 @@
<template>
  <a-card :bordered="false">
    <!-- æŸ¥è¯¢åŒºåŸŸ -->
    <div class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="准备单编号">
              <a-input placeholder="请输入准备单编号" v-model="queryParam.preparationOrderNum"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="单据状态">
              <a-select placeholder="请输入准备单编号" v-model="queryParam.orderStatus">
                <a-select-option value="1">待审核</a-select-option>
                <a-select-option value="2">已审核</a-select-option>
                <a-select-option value="3">已转出</a-select-option>
              </a-select>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
<!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
<!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
<!--              </a>-->
            </span>
          </a-col>
        </a-row>
      </a-form>
    </div>
    <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

    <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
    <div class="table-operator">
<!--      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>-->
      <a-button @click="handleConvert" type="primary" icon="arrow-right">转出库申请单</a-button>
<!--      <a-button type="primary" icon="download" @click="handleExportXls('刀具准备单')">导出</a-button>-->
<!--      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<!--        <a-button type="primary" icon="import">导入</a-button>-->
<!--      </a-upload>-->
      <!-- é«˜çº§æŸ¥è¯¢åŒºåŸŸ -->
<!--      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>-->
    </div>

    <!-- table区域-begin -->
    <div>
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> å·²é€‰æ‹© <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        class="j-table-force-nowrap"
        :scroll="{x:true}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange, type:'checkbox'}"
        :customRow="clickThenSelect"
        @change="handleTableChange">

<!--        <template slot="htmlSlot" slot-scope="text">-->
<!--          <div v-html="text"></div>-->
<!--        </template>-->
<!--        <template slot="imgSlot" slot-scope="text,record">-->
<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>-->
<!--          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>-->
<!--        </template>-->
<!--        <template slot="fileSlot" slot-scope="text">-->
<!--          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>-->
<!--          <a-button-->
<!--            v-else-->
<!--            :ghost="true"-->
<!--            type="primary"-->
<!--            icon="download"-->
<!--            size="small"-->
<!--            @click="downloadFile(text)">-->
<!--            ä¸‹è½½-->
<!--          </a-button>-->
<!--        </template>-->

        <span slot="action" slot-scope="text, record">
          <a @click="handleDetail(record)">详情</a>
          <span v-if="record.orderStatus === '1'">
            <a-divider type="vertical" />
            <a @click="handleConfirm(record)">审核</a>
            <a-divider type="vertical" />
            <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
                    <a>删除</a>
            </a-popconfirm>
          </span>

<!--          <a-divider type="vertical" />-->
<!--          <a-dropdown>-->
<!--            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>-->
<!--            <a-menu slot="overlay">-->
<!--              <a-menu-item>-->
<!--                <a @click="handleEdit(record)">编辑</a>-->
<!--              </a-menu-item>-->
<!--              <a-menu-item>-->
<!--                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">-->
<!--                  <a>删除</a>-->
<!--                </a-popconfirm>-->
<!--              </a-menu-item>-->
<!--            </a-menu>-->
<!--          </a-dropdown>-->
        </span>

      </a-table>
    </div>

    <a-tabs defaultActiveKey="1">
      <a-tab-pane tab="刀具准备单明细" key="1" >
        <PreparationOrderDetailList :mainId="preparationOrderDetailMainId" />
      </a-tab-pane>
    </a-tabs>

    <preparationOrder-modal ref="modalForm" @ok="modalFormOk"></preparationOrder-modal>
  </a-card>
</template>

<script>

  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import PreparationOrderModal from './modules/preparationOrder/PreparationOrderModal'
  import { getAction } from '@/api/manage'
  import PreparationOrderDetailList from './PreparationOrderDetailList'
  import '@/assets/less/TableExpand.less'
  import { postAction } from '../../api/manage'

  export default {
    name: "PreparationOrderList",
    mixins:[JeecgListMixin],
    components: {
      PreparationOrderDetailList,
      PreparationOrderModal
    },
    data () {
      return {
        description: '刀具准备单管理页面',
        // è¡¨å¤´
        columns: [
          {
            title:'准备单编号',
            align:"left",
            dataIndex: 'preparationOrderNum'
          },
          {
            title:'零件图号',
            align:"center",
            dataIndex: 'partDrawingNo'
          },
          {
            title:'零件名称',
            align:"center",
            dataIndex: 'partName'
          },
          {
            title:'零件材料',
            align:"center",
            dataIndex: 'partMaterial'
          },
          {
            title:'工序',
            align:"center",
            dataIndex: 'productionProcessesNo'
          },
          {
            title:'加工批次',
            align:"center",
            dataIndex: 'batchCode'
          },
          {
            title:'加工数量',
            align:"left",
            dataIndex: 'machiningCount'
          },
          {
            title:'加工设备',
            align:"center",
            dataIndex: 'equipmentCode'
          },
          {
            title:'程序名',
            align:"center",
            dataIndex: 'ncName'
          },
          {
            title:'单子状态',
            align:"center",
            dataIndex: 'orderStatus_dictText'
          },
          {
            title:'提交时间(提交至出库申请)',
            align:"center",
            dataIndex: 'outboundTime'
          },
          {
            title:'备注',
            align:"center",
            dataIndex: 'remark'
          },
          {
            title:'创建人',
            align:"center",
            dataIndex: 'createBy'
          },
          {
            title:'创建时间(DNC推送时间)',
            align:"center",
            dataIndex: 'createTime'
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' },
          }
        ],
        url: {
          list: "/tms/preparationOrder/list",
          convertToOutboundOrder: "/tms/preparationOrder/convertToOutboundOrder",
          delete: "/tms/preparationOrder/delete",
          deleteBatch: "/tms/preparationOrder/deleteBatch",
          exportXlsUrl: "/tms/preparationOrder/exportXls",
          importExcelUrl: "tms/preparationOrder/importExcel",
        },
        dictOptions:{
        },
        /* åˆ†é¡µå‚æ•° */
        ipagination:{
          current: 1,
          pageSize: 5,
          pageSizeOptions: ['5', '10', '50'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " å…±" + total + "条"
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        selectedMainId:'',
        superFieldList:[],
        preparationOrderDetailMainId: '',
      }
    },
    created() {
      this.getSuperFieldList();
    },
    computed: {
      importExcelUrl: function(){
        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
      }
    },
    methods: {
      handleConvert() {
        if (this.selectedRowKeys.length < 1) {
          this.$message.warning('请至少选择一条申请单数据！')
          return
        }
        console.log(this.selectionRows)
        console.log(this.selectedRowKeys)
        postAction(this.url.convertToOutboundOrder, this.selectedRowKeys).then((res) => {
          if (res.success) {
            this.$message.success(res.message)
            this.loadData(this.ipagination.current)
          } else {
            this.$message.warning(res.message)
          }
        })
      },
      handleConfirm(record) {
        this.$refs.modalForm.edit(record);
        this.$refs.modalForm.title = "审核";
        this.$refs.modalForm.disableSubmit = false;
      },
      searchReset() {
        this.queryParam = {}
        this.preparationOrderDetailMainId = ''
        this.loadData(1)
      },
      initDictConfig(){
      },
      clickThenSelect(record) {
        return {
          on: {
            click: () => {
              this.onClickChange(record.id.split(","), [record]);
            }
          }
        }
      },
      onClickChange(selectedRowKeys, selectionRows) {
        this.preparationOrderDetailMainId = selectionRows[0]['id']
      },
      onClearSelected() {
        this.selectedRowKeys = [];
        this.selectionRows = [];
        this.selectedMainId=''
      },
      onSelectChange(selectedRowKeys, selectionRows) {
        this.selectedMainId=selectedRowKeys[0]
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;
      },
      loadData(arg) {
        if(!this.url.list){
          this.$message.error("请设置url.list属性!")
          return
        }
        //加载数据 è‹¥ä¼ å…¥å‚æ•°1则加载第一页的内容
        if (arg === 1) {
          this.ipagination.current = 1;
        }
        this.onClearSelected()
        var params = this.getQueryParams();//查询条件
        this.loading = true;
        getAction(this.url.list, params).then((res) => {
          if (res.success) {
            this.dataSource = res.result.records;
            this.ipagination.total = res.result.total;
          }
          if(res.code===510){
            this.$message.warning(res.message)
          }
          this.loading = false;
        })
      },
      getSuperFieldList(){
        let fieldList=[];
        fieldList.push({type:'string',value:'preparationOrderNum',text:'准备单编号',dictCode:''})
        fieldList.push({type:'string',value:'partDrawingNo',text:'零件图号',dictCode:''})
        fieldList.push({type:'string',value:'partName',text:'零件名称',dictCode:''})
        fieldList.push({type:'string',value:'partMaterial',text:'零件材料',dictCode:''})
        fieldList.push({type:'string',value:'productionProcessesNo',text:'工序（工步号）',dictCode:''})
        fieldList.push({type:'string',value:'batchCode',text:'加工批次',dictCode:''})
        fieldList.push({type:'string',value:'machiningCount',text:'加工数量',dictCode:''})
        fieldList.push({type:'string',value:'equipmentCode',text:'加工设备',dictCode:''})
        fieldList.push({type:'string',value:'ncName',text:'程序名',dictCode:''})
        fieldList.push({type:'BigDecimal',value:'outboundQuantity',text:'准备单出库数量',dictCode:''})
        fieldList.push({type:'string',value:'orderStatus',text:'单子状态;1.未审核；2.调机员已审核；3.已转出库申请',dictCode:''})
        fieldList.push({type:'date',value:'outboundTime',text:'准备单提交时间;提交至出库申请单的时间'})
        fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
        fieldList.push({type:'string',value:'createBy',text:'创建人',dictCode:''})
        fieldList.push({type:'date',value:'createTime',text:'创建时间;DNC推送数据时间'})
        this.superFieldList = fieldList
      }
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less'
</style>

 src/views/tms/modules/baseTools/DncToolsSelectModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,1081 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    switchFullscreen
    @ok="handleOk"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    @cancel="handleCancel"
    cancelText="关闭"
    :footer="null"
  >
    <a-card :bordered="false">
      <!-- æŸ¥è¯¢åŒºåŸŸ -->
      <div class="table-page-search-wrapper">
        <a-form layout="inline" @keyup.enter.native="searchQuery">
          <!-- é€šç”¨æŸ¥è¯¢å‚æ•° -->
          <a-row :gutter="24">
            <a-col :md="8" :sm="8">
              <a-form-item label="工具类型" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-select
                  :options="toolTypeList"
                  placeholder="请选择工具类型检索"
                  v-model="queryParam.classifyId"
                  @change="handleToolTypeChange"
                ></a-select>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8">
              <a-form-item label="工具简称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  disabled
                  placeholder="请输入工具简称检索"
                  v-model="queryParam.aliasLabel"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8">
              <a-form-item label="直径参数" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入直径参数检索"
                  v-model="queryParam.diameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8">
              <a-form-item label="工具编码" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入工具编码检索"
                  v-model="queryParam.toolCode"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8">
              <a-form-item label="型号/图号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入型号/图号检索"
                  v-model="queryParam.toolModel"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8">
              <a-form-item label="中文名称" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入中文名称检索"
                  v-model="queryParam.chineseName"
                ></a-input>
              </a-form-item>
            </a-col>
            <!-- å­”加工工具类查询参数 -->
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="切削刃长" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请切削刃长检索"
                  v-model="queryParam.edgeLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="刃数" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刃数检索"
                  v-model="queryParam.bladeCount"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="有效加工长度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入有效加工长度检索"
                  v-model="queryParam.effectiveLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="最小镗孔直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最小镗孔直径检索"
                  v-model="queryParam.latestBoringDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="最大镗孔直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最大镗孔直径检索"
                  v-model="queryParam.maxBoringDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="刀杆直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆直径检索"
                  v-model="queryParam.knifeDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="孔径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入孔径检索"
                  v-model="queryParam.boreDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraHoleToolsFlag">
              <a-form-item label="刀头数" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀头数检索"
                  v-model="queryParam.headsNumber"
                ></a-input>
              </a-form-item>
            </a-col>
            <!-- é“£å‰Šåˆ€å…·ç±»æŸ¥è¯¢å‚æ•° -->
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="切削刃长" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入切削刃长检索"
                  v-model="queryParam.edgeLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="齿数" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入齿数检索"
                  v-model="queryParam.numberOfTeeth"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="颈径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入颈径检索"
                  v-model="queryParam.neckDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="最小直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最小直径检索"
                  v-model="queryParam.smallDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="柄长" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入柄长检索"
                  v-model="queryParam.handleLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="最大切深" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最大切深检索"
                  v-model="queryParam.deepestDepth"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="柄颈长度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入柄颈长度检索"
                  v-model="queryParam.handleNeckLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="悬伸长度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入悬伸长度检索"
                  v-model="queryParam.overhangingLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="螺距" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺距检索"
                  v-model="queryParam.pitch"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraMillToolFlag">
              <a-form-item label="最小加工直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最小加工直径检索"
                  v-model="queryParam.recentlyDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <!-- è½¦å‰Šåˆ€å…·ç±»å‚æ•° -->
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="最小直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最小直径检索"
                  v-model="queryParam.smallDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="配套刀片号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入配套刀片号检索"
                  v-model="queryParam.matchingNumber"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="切削方向" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入切削方向检索"
                  v-model="queryParam.cuttingDirection"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀片尺寸" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀片尺寸检索"
                  v-model="queryParam.knifeSize"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="镗杆直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入镗杆直径检索"
                  v-model="queryParam.boringBarDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀杆长度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆长度检索"
                  v-model="queryParam.bladeLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀杆方向" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆方向检索"
                  v-model="queryParam.barDirection"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀杆高度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆高度检索"
                  v-model="queryParam.bladeHeight"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀杆宽度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆宽度检索"
                  v-model="queryParam.bladeWide"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀片槽宽" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀片槽宽检索"
                  v-model="queryParam.slotWidth"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="最大切入直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最大切入直径检索"
                  v-model="queryParam.maxDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="最大切槽深度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最大切槽深度检索"
                  v-model="queryParam.maxDepth"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="刀板厚度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀板厚度检索"
                  v-model="queryParam.bladeThickness"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraTurningToolsFlag">
              <a-form-item label="最小加工直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最小加工直径检索"
                  v-model="queryParam.minDiameter"
                ></a-input>
              </a-form-item>
            </a-col>
            <!-- èžºçº¹åˆ€å…·ç±»æŸ¥è¯¢å‚æ•° -->
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="切削刃长" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入切削刃长检索"
                  v-model="queryParam.edgeLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺距" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺距检索"
                  v-model="queryParam.pitch"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺纹代号" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺纹代号检索"
                  v-model="queryParam.threadCode"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺纹旋向" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺纹旋向检索"
                  v-model="queryParam.rotationDirection"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺纹公差带代号/精度等级" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺纹公差带代号/精度等级检索"
                  v-model="queryParam.tolerancezoneLevel"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="外型尺寸" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入外型尺寸检索"
                  v-model="queryParam.externalDimensions"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="柄部规格" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入柄部规格检索"
                  v-model="queryParam.handleSpecifications"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺孔类型" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺孔类型检索"
                  v-model="queryParam.screwHoleType"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺纹标准" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺纹标准检索"
                  v-model="queryParam.threadStandard"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="排屑槽型" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入排屑槽型检索"
                  v-model="queryParam.fluteSoltType"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="螺纹类型" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺纹类型检索"
                  v-model="queryParam.threadType"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="导向尺寸" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入导向尺寸检索"
                  v-model="queryParam.guidingSize"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="连接孔径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入连接孔径检索"
                  v-model="queryParam.connectionAperture"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraThreadingToolFlag">
              <a-form-item label="连接键槽" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入连接键槽检索"
                  v-model="queryParam.connectingKeyway"
                ></a-input>
              </a-form-item>
            </a-col>
            <!-- åˆ€ç‰‡ç±»å‚æ•° -->
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="螺距" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺距检索"
                  v-model="queryParam.pitch"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="切削方向" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入切削方向检索"
                  v-model="queryParam.cuttingDirection"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀片尺寸" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀片尺寸检索"
                  v-model="queryParam.knifeSize"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀杆长度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆长度检索"
                  v-model="queryParam.bladeLength"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀杆宽度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀杆宽度检索"
                  v-model="queryParam.bladeWide"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="螺纹标准" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入螺纹标准检索"
                  v-model="queryParam.threadStandard"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀片形状" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀片形状检索"
                  v-model="queryParam.bladeShape"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="切削刃数" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入切削刃数检索"
                  v-model="queryParam.cuttingEdgeCount"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="夹固型式" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入夹固型式检索"
                  v-model="queryParam.clampingType"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀尖R" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀尖R检索"
                  v-model="queryParam.noseAngleR"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="加工分类" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入加工分类检索"
                  v-model="queryParam.processingClassify"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀片后角" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀片后角检索"
                  v-model="queryParam.bladePosterior"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="刀片尺寸" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入刀片尺寸检索"
                  v-model="queryParam.bladeSize"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="内外螺纹" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入内外螺纹检索"
                  v-model="queryParam.inOutThread"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="牙型角度" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入牙型角度检索"
                  v-model="queryParam.dentalAngle"
                ></a-input>
              </a-form-item>
            </a-col>
            <a-col :md="8" :sm="8" v-if="paraBladeFlag">
              <a-form-item label="最小加工内螺纹公称直径" :labelCol="{span: 5}" :wrapperCol="{span: 18, offset: 1}">
                <a-input
                  placeholder="请输入最小加工内螺纹公称直径检索"
                  v-model="queryParam.minInternalThread"
                ></a-input>
              </a-form-item>
            </a-col>

            <a-col :md="6" :sm="24">
            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
            </span>
            </a-col>

          </a-row>
        </a-form>
      </div>
      <!-- æŸ¥è¯¢åŒºåŸŸ-END -->

      <!-- æ“ä½œæŒ‰é’®åŒºåŸŸ -->
      <div class="table-operator">
      </div>

      <!-- table区域-begin -->
      <div>

        <a-table
          ref="table"
          size="middle"
          :scroll="{x:true}"
          bordered
          rowKey="id"
          :columns="columns"
          :dataSource="dataSource"
          :pagination="ipagination"
          :loading="loading"
          :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange,type:'radio'}"
          class="j-table-force-nowrap"
          :customRow="customRow"
          @change="handleTableChange">

          <span slot="action" slot-scope="text, record">
            <a @click="handleDetail(record)">详情</a>
            <a-divider type="vertical" />
            <a @click="handleSelect(record)">选择</a>
          </span>

        </a-table>
      </div>

      <a-tabs defaultActiveKey="1">
        <a-tab-pane key="1">
        <span slot="tab">
          <a-badge>参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
          <para-hole-tools-list ref="paraHoleToolsList"></para-hole-tools-list>
          <para-threading-tool-list ref="paraThreadingToolList"></para-threading-tool-list>
          <para-mill-tool-list ref="paraMillToolList"></para-mill-tool-list>
          <para-turning-tools-list ref="paraTurningToolsList"></para-turning-tools-list>
          <para-blade-list ref="paraBladeList"></para-blade-list>
          <para-common-tool-list ref="paraCommonToolList"></para-common-tool-list>
        </a-tab-pane>

        <a-tab-pane
          key="2"
          forceRender
        >
        <span slot="tab">
          <a-badge>管理参数&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
          <tools-config-property-list ref="toolsConfigPropertyList"></tools-config-property-list>
        </a-tab-pane>
      </a-tabs>

      <base-tools-modal ref="modalForm" @ok="modalFormOk" :nodeSelected="nodeSelected"></base-tools-modal>
      <para-hole-tools-modal ref="paraHoleToolsModal" @ok="modalFormOk"
                             :nodeSelected="nodeSelected"></para-hole-tools-modal>
      <para-threading-tool-modal ref="paraThreadingToolModal"></para-threading-tool-modal>
      <para-mill-tool-modal ref="paraMillToolModal"></para-mill-tool-modal>
      <para-turning-tools-modal ref="paraTurningToolsModal"></para-turning-tools-modal>
      <para-blade-modal ref="paraBladeModal"></para-blade-modal>
      <para-common-tool-modal ref="paraCommonToolModal"></para-common-tool-modal>
      <para-base-modal ref="paraBaseModal"></para-base-modal>
    </a-card>
  </j-modal>
</template>

<script>

import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import BaseToolsModal from './BaseToolsModal'
import Tooltip from 'ant-design-vue/es/tooltip'
import { getAction, postAction, deleteAction, requestPut } from '@api/manage'
import ParaBaseModal from './ParaBaseModal.vue'
import ParaHoleToolsModal from './ParaHoleToolsModal'
import ParaMillToolModal from './ParaMillToolModal'
import ParaThreadingToolModal from './ParaThreadingToolModal'
import ParaTurningToolsModal from './ParaTurningToolsModal'
import ToolsConfigPropertyModal from './ToolsConfigPropertyModal'
import ParaCommonToolModal from './ParaCommonToolModal'
import ParaBladeModal from './ParaBladeModal'
import ParaHoleToolsList from './ParaHoleToolsList'
import ToolsConfigPropertyList from './ToolsConfigPropertyList'
import ParaMillToolList from './ParaMillToolList'
import ParaThreadingToolList from './ParaThreadingToolList'
import ParaTurningToolsList from './ParaTurningToolsList'
import ParaCommonToolList from './ParaCommonToolList'
import ParaBladeList from './ParaBladeList'

export default {
  name: 'DncToolsSelectListRight',
  mixins: [JeecgListMixin, mixinDevice],
  components: {
    BaseToolsModal,
    Tooltip,
    ParaBaseModal,
    ParaHoleToolsModal,
    ParaMillToolModal,
    ParaThreadingToolModal,
    ParaTurningToolsModal,
    ToolsConfigPropertyModal,
    ParaCommonToolModal,
    ParaBladeModal,
    ParaHoleToolsList,
    ToolsConfigPropertyList,
    ParaMillToolList,
    ParaThreadingToolList,
    ParaTurningToolsList,
    ParaCommonToolList,
    ParaBladeList
  },
  data() {
    return {
      description: 'DNC刀具选择页面',
      title: '',
      width: 1200,
      visible: false,
      disableSubmit: false,
      toolTypeList: [],
      param: {},
      paraHoleToolsFlag: false,
      paraMillToolFlag: false,
      paraThreadingToolFlag: false,
      paraTurningToolsFlag: false,
      paraBladeFlag: false,
      paraCommonToolFlag: false,
      /* åˆ†é¡µå‚æ•° */
      ipagination: {
        current: 1,
        pageSize: 10,
        pageSizeOptions: ['10', '20', '50'],
        showTotal: (total, range) => {
          return range[0] + '-' + range[1] + ' å…±' + total + '条'
        },
        showQuickJumper: true,
        showSizeChanger: true,
        total: 0
      },
      // è¡¨å¤´
      columns: [
        {
          title: '#',
          dataIndex: '',
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
            return parseInt(index) + 1
          }
        },
        {
          title: '工具编码',
          align: 'center',
          dataIndex: 'toolCode'
        },
        {
          title: '工具类型',
          align: 'center',
          dataIndex: 'classifyName'
        },
        {
          title: '序号',
          align: 'center',
          dataIndex: 'signCode'
        },
        {
          title: '中文名称',
          align: 'center',
          dataIndex: 'chineseName'
        },
        {
          title: '外文名称',
          align: 'center',
          dataIndex: 'foreignLanguageName'
        },
        {
          title: '标注级别',
          align: 'center',
          dataIndex: 'standardLevel'
        },
        {
          title: '标准号',
          align: 'center',
          dataIndex: 'standardCode'
        },
        {
          title: '型号/图号',
          align: 'center',
          dataIndex: 'toolModel'
        },
        {
          title: '备注',
          align: 'center',
          dataIndex: 'remark'
        },
        {
          title: '操作',
          dataIndex: 'action',
          align: 'center',
          fixed: 'right',
          width: 147,
          scopedSlots: { customRender: 'action' }
        }
      ],
      url: {
        list: '/tms/toolsToDnc/queryToolByParam',
        queryToolClassifyByParam: '/tms/toolsToDnc/queryToolClassifyByParam',
        queryParaByToolCode: '/tms/baseTools/queryByToolCode',
        queryByToolCode: '/tms/toolsConfigProperty/queryByToolCode',
        queryToolsClassify: '/tms/toolsClassify/queryById'
      },
      dictOptions: {},
      nodeSelected: {}, // å½“前选中的节点数据
      disableMixinCreated: true,
      queryParam: {
        aliasLabel: '',
        diameter: '',
        toolCode: '',
        toolModel: '',
        chineseName: ''
      }
    }
  },
  created() {
  },
  computed: {
  },
  methods: {
    open(param) {
      this.param = param
      this.visible = true
      this.queryParam.aliasLabel = param.aliasLabel
      this.queryParam.diameter = param.diameter
      getAction(this.url.queryToolClassifyByParam, { aliasLabel: param.aliasLabel }).then((res) => {
        if (res.success) {
          this.toolTypeList = res.result
        }
      })
      this.loadData()
    },
    loadData() {
      var params = this.getQueryParams();//查询条件
      console.log(params)
      if(!params){
        return false;
      }
      this.loading = true;
      getAction(this.url.list, params).then((res) => {
        if (res.success) {
          this.dataSource = res.result.records||res.result;
          if(res.result.total)
          {
            this.ipagination.total = res.result.total;
          }else{
            this.ipagination.total = 0;
          }
        }else{
          this.$message.warning(res.message)
        }
      }).finally(() => {
        this.loading = false
      })
    },
    handleToolTypeChange(value) {
      getAction(this.url.queryToolsClassify, { id: value }).then((res) => {
        if (res.success) {
          const paraTypeFlag = res.result.paraTypeFlag
          console.log(paraTypeFlag)
          switch (paraTypeFlag) {
            case '1':
              this.paraHoleToolsFlag = false
              this.paraMillToolFlag = false
              this.paraThreadingToolFlag = false
              this.paraTurningToolsFlag = false
              this.paraBladeFlag = false
              this.paraCommonToolFlag = true
              break
            case '2':
              this.paraHoleToolsFlag = true
              this.paraMillToolFlag = false
              this.paraThreadingToolFlag = false
              this.paraTurningToolsFlag = false
              this.paraBladeFlag = false
              this.paraCommonToolFlag = false
              break
            case '3':
              this.paraHoleToolsFlag = false
              this.paraMillToolFlag = false
              this.paraThreadingToolFlag = true
              this.paraTurningToolsFlag = false
              this.paraBladeFlag = false
              this.paraCommonToolFlag = false
              break
            case '4':
              this.paraHoleToolsFlag = false
              this.paraMillToolFlag = true
              this.paraThreadingToolFlag = false
              this.paraTurningToolsFlag = false
              this.paraBladeFlag = false
              this.paraCommonToolFlag = false
              break
            case '5':
              this.paraHoleToolsFlag = false
              this.paraMillToolFlag = false
              this.paraThreadingToolFlag = false
              this.paraTurningToolsFlag = true
              this.paraBladeFlag = false
              this.paraCommonToolFlag = false
              break
            case '6':
              this.paraHoleToolsFlag = false
              this.paraMillToolFlag = false
              this.paraThreadingToolFlag = false
              this.paraTurningToolsFlag = false
              this.paraBladeFlag = true
              this.paraCommonToolFlag = false
              break
          }
        } else {
          this.$message.warning(res.message)
        }
      })
    },
    handleCancel() {
      this.queryParam = {}
      this.clearQueryFlag()
      this.clearPara()
      this.visible = false
    },
    handleOk() {
    },
    onSelectChange(selectedRowKeys, selectedRows) {
      this.clearPara()
      this.selectedRowKeys = selectedRowKeys
      const paraTypeFlag = selectedRows[0].paramaTableName
      const toolCode = selectedRows[0].toolId
      //通过id查询管理参数和参数数据
      if (toolCode) {
        getAction(this.url.queryByToolCode, { toolCode: selectedRows[0].toolId }).then((res) => {
          if (res.success) {
            this.$refs.toolsConfigPropertyList.getPara(res.result)
          } else {
            this.$message.warning(res.message)
          }
        })
        if (paraTypeFlag) {
          getAction(this.url.queryParaByToolCode, {
            toolCode: toolCode,
            paraTypeFlag: paraTypeFlag
          }).then((res) => {
            if (res.success) {
              switch (paraTypeFlag) {
                case '1':
                  this.$refs.paraCommonToolList.getPara(res.result)
                  break
                case '2':
                  this.$refs.paraHoleToolsList.getPara(res.result)
                  break
                case '3':
                  this.$refs.paraThreadingToolList.getPara(res.result)
                  break
                case '4':
                  this.$refs.paraMillToolList.getPara(res.result)
                  break
                case '5':
                  this.$refs.paraTurningToolsList.getPara(res.result)
                  break
                case '6':
                  this.$refs.paraBladeList.getPara(res.result)
                  break
              }
            } else {
              this.$message.warning(res.message)
            }
          })
        }
      }
    },
    handleSelect(record) {
      console.log(record)
      this.clearQueryFlag()
      this.clearPara()
      this.visible = false
    },
    //详情
    handleDetail: function(record) {
      console.log(record)
      const paramaTableName = record.paramaTableName
      switch (paramaTableName) {
        case '1':
          this.$refs.paraCommonToolModal.edit(record)
          this.$refs.paraCommonToolModal.title = '详情'
          this.$refs.paraCommonToolModal.disableSubmit = true
          this.$refs.paraCommonToolModal.disSeach = true
          break
        case '2':
          this.$refs.paraHoleToolsModal.edit(record)
          this.$refs.paraHoleToolsModal.title = '详情'
          this.$refs.paraHoleToolsModal.disableSubmit = true
          this.$refs.paraHoleToolsModal.disSeach = true
          break
        case '3':
          this.$refs.paraThreadingToolModal.edit(record)
          this.$refs.paraThreadingToolModal.title = '详情'
          this.$refs.paraThreadingToolModal.disableSubmit = true
          this.$refs.paraThreadingToolModal.disSeach = true
          break
        case '4':
          this.$refs.paraMillToolModal.edit(record)
          this.$refs.paraMillToolModal.title = '详情'
          this.$refs.paraMillToolModal.disableSubmit = true
          this.$refs.paraMillToolModal.disSeach = true
          break
        case '5':
          this.$refs.paraTurningToolsModal.edit(record)
          this.$refs.paraTurningToolsModal.title = '详情'
          this.$refs.paraTurningToolsModal.disableSubmit = true
          this.$refs.paraTurningToolsModal.disSeach = true
          break
        case '6':
          this.$refs.paraBladeModal.edit(record)
          this.$refs.paraBladeModal.title = '详情'
          this.$refs.paraBladeModal.disableSubmit = true
          this.$refs.paraBladeModal.disSeach = true
          break
        default:
          this.$refs.paraBaseModal.edit(record)
          this.$refs.paraBaseModal.title = '详情'
          this.$refs.paraBaseModal.disableSubmit = true
          this.$refs.paraBaseModal.disSeach = true
          break
      }
    },
    onClearSelected() {
      this.selectedKeys = []
      this.nodeSelected = {} // æ¸…空选中的节点
      this.dataSource = [] // æ¸…空表格数据
    },
    searchQuery() {
      this.clearPara()
      this.loadData(1);
    },
    //重置
    searchReset() {
      this.queryParam = {
        aliasLabel: this.param.aliasLabel,
        diameter: this.param.diameter
      }
      this.clearQueryFlag()
      this.clearPara()
      this.loadData(1)
    },
    clearQueryFlag() {
      this.paraHoleToolsFlag = false
      this.paraMillToolFlag = false
      this.paraThreadingToolFlag = false
      this.paraTurningToolsFlag = false
      this.paraBladeFlag = false
      this.paraCommonToolFlag = false
    },
    //清空选中及参数
    clearPara() {
      this.selectedRowKeys = []
      this.$refs.paraCommonToolList.visable = false
      this.$refs.paraHoleToolsList.visable = false
      this.$refs.paraThreadingToolList.visable = false
      this.$refs.paraMillToolList.visable = false
      this.$refs.paraTurningToolsList.visable = false
      this.$refs.paraBladeList.visable = false
      this.$refs.toolsConfigPropertyList.visable = false
    },
    customRow(record) {
      return {
        on: {
          click: () => {
            this.onSelectChange(record.id.split(','), [record])
          }
        }
      }
    }

  }
}
</script>
<style scoped>
@import '~@assets/less/common.less';

.enable {
  color: green;
}

.disable {
  color: red;
}
</style>

 src/views/tms/modules/baseTools/ParaBaseModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,288 @@
<template>
  <j-modal
    :title="title"
    :width="1200"
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å·¥å…·åŸºç¡€ä¿¡æ¯
        </a-divider>

        <a-row :gutter="24">
              <a-col :span="8">
                <a-form-model-item prop="classifyNum" label="工具分类编码">
                  <a-input placeholder="请输入工具分类编码" v-model="model.classifyNum" :disabled="true" />
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="classifyName" label="工具分类名称">
                  <a-input placeholder="请输入工具分类名称" v-model="model.classifyName"  :disabled="true" />
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="toolCode" label="工具编码">
                  <a-input :placeholder="disableSubmit?'':'请输入工具编码'" v-model="model.toolCode" :disabled="disableSubmit"/>
                </a-form-model-item>
              </a-col>
            </a-row>

            <a-row>
              <a-col :span="8">
                <a-form-model-item prop="chineseName"
                                   label="中文名称">
                  <a-input :placeholder="disableSubmit?'':'请输入中文名称'" v-model="model.chineseName" :disabled="disableSubmit"/>
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="foreignLanguageName"
                                   label="外文名称">
                  <a-input :placeholder="disableSubmit?'':'请输入外文名称'" v-model="model.foreignLanguageName" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="toolModel"
                                   label="型号/图号">
                  <a-input :placeholder="disableSubmit?'':'请输入型号/图号'" v-model="model.toolModel" :disabled="disableSubmit" />
                </a-form-model-item>
              </a-col>
            </a-row>
            <a-row>
             <a-col :span="8">
                <a-form-model-item prop="standardLevel"
                                   label="标注级别">
                  <a-input :placeholder="disableSubmit?'':'请输入标准级别'" v-model="model.standardLevel" :disabled="disableSubmit"/>
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="standardCode" label="标准号">
                  <a-input :placeholder="disableSubmit?'':'请输入标准号'" v-model="model.standardCode" :disabled="disableSubmit"/>
                </a-form-model-item>
              </a-col>
              <a-col :span="8">
                <a-form-model-item prop="signCode" label="序号">
                  <a-input :placeholder="disableSubmit?'':'请输入序号'" v-model="model.signCode" :disabled="disableSubmit"/>
                </a-form-model-item>
              </a-col>
        </a-row>

      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>
import { getAction,postAction, httpAction } from '@/api/manage'
import { validateDuplicateValueInDelFlag } from '@/utils/util'
import JSelectProduction from '@comp/jeecgbiz/JSelectProduction.vue'
import { getSystemConfigValue } from '@api/api'
  import { duplicateCheck } from '@/api/api'//重复校验

export default {
  name: 'ParaBaseModal',
  components: { JSelectProduction },
  data() {
    return {
      title: '操作',
      visible: false,
      //控制编辑
      editable: false,
      //详情控制
      disableSubmit: false,
      model: {},
      labelCol: {
        xs: { span: 24 },
        sm: { span: 9 }
      },
      wrapperCol: {
        xs: { span: 24 },
        sm: { span: 14 }
      },
      labelColLong: {
        xs: { span: 24 },
        sm: { span: 2 }
      },
      wrapperColLong: {
        xs: { span: 24 },
        sm: { span: 22 }
      },
      confirmLoading: false,
      validatorRules: {
        toolCode: [
          { required: true, message: '请输入工具编码' },
          { validator: this.validateNum }
        ],
        classifyNum: [
          { required: true, message: '请输入工具分类编码' }
        ],
        classifyName: [
          { required: true, message: '请输入工具分类名称' }
        ],
        toolModel: [
          { required: true, message: '请输入型号/图号' },
           { validator: this.validateModel }
        ],
        chineseName: [
          { required: true, message: '请输入中文名称' }
        ],
        bladeShape: [
          { required: true, message: '请输入刀片形状' }
        ],
        bladeLength: [
          { required: true, message: '请输入刀片长度' }
        ],
        cuttingEdgeCount: [
          { required: true, message: '请输入切削刃数' }
        ],
        bladeThickness: [
          { required: true, message: '请输入刀片厚度' }
        ],
        clampingType: [
          { required: true, message: '请输入夹固型式' }
        ],
         noseAngleR: [
          { required: true, message: '请输入刀尖R' }
        ],
        toolMaterial: [
          { required: true, message: '请输入刀片材料' }
        ],
        paintcoatFlag: [
          { required: true, message: '请选择是否涂层' }
        ],
        technicalConditions: [
          { required: true, message: '请输入附加技术条件' }
        ]
      },
      url: {
        add: '/tms/baseTools/add',
        edit: '/tms/baseTools/edit',
      },
    }
  },
  created() {
  },
  methods: {
    add(nodeSelected) {
      this.editable = false;
      //初始化默认值
      this.model = {};
      this.model.classifyId = nodeSelected.key
      this.model.classifyNum = nodeSelected.entity.classifyId
      this.model.classifyName = nodeSelected.entity.typeName
      this.model.paraTypeFlag = nodeSelected.entity.paraTypeFlag
      this.visible = true
    },
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      this.visible = true
    },
    close() {
      this.$emit('close')
      this.visible = false
      this.$refs.form.clearValidate()
    },
    handleOk() {
      const that = this
      // è§¦å‘表单验证
      this.$refs.form.validate(valid => {
        if (valid) {
          that.confirmLoading = true
          let formData = Object.assign(this.model)
          let httpUrl = ''
            let method = 'post'
            if (!this.model.id) {
              httpUrl += this.url.add
            } else {
              httpUrl += this.url.edit
            }
           httpAction(httpUrl, formData, method)
            .then((res) => {
              if (res.success) {
                that.$message.success(res.message)
               that.$emit('ok')
              } else {
                that.$message.warning(res.message)
              }
            })
            .finally(() => {
              that.confirmLoading = false
              that.close()
            })
        }
      })
    },
    handleCancel() {
      this.close()
    },
      //验证工具编码是否重复
    validateNum(rule, value, callback) {
      var params = {
        tableName: 'tms_base_tools',
        fieldName: 'tool_code',
        fieldVal: value,
        dataId: this.model.id
      };
      duplicateCheck(params).then((res) => {
        if (res.success) {
          callback()
        } else {
          callback("工具编码已存在!")
        }
      })
    },
      //验证型号/图号是否重复
    validateModel(rule, value, callback) {
      var params = {
        tableName: 'tms_base_tools',
        fieldName: 'tool_model',
        fieldVal: value,
        dataId: this.model.id
      };
      duplicateCheck(params).then((res) => {
        if (res.success) {
          callback()
        } else {
          callback("型号/图号已存在!")
        }
      })
    },
  }
}
</script>

<style lang="less" scoped>
/deep/ .ant-modal-body {
  padding: 0 24px;
}

/deep/ .ant-upload {
  width: 185px;
  height: 185px;
}

/deep/ .img {
  display: flex;
  justify-content: center;

  .ant-upload-picture-card-wrapper {
    width: auto;
  }
}

/deep/ .ant-upload-list-picture-card-container {
  width: 185px;
  height: 185px;
}

/deep/ .ant-upload-list-item {
  width: 185px;
  height: 185px;
}
</style>

 src/views/tms/modules/preparationOrder/PreparationOrderDetailModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,143 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
        <a-row>
          <a-col :span="24">
            <a-form-model-item label="准备单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="preparationOrderId">
              <a-input v-model="model.preparationOrderId"placeholder="请输入准备单号" ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="刀具编码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolCode">
              <a-input v-model="model.toolCode"placeholder="请输入刀具编码" ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="刀具编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolId">
              <a-input v-model="model.toolId"placeholder="请输入刀具编号" ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="申请出库数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="outboundQuantity">
              <a-input-number v-model="model.outboundQuantity"placeholder="请输入申请出库数量" style="width: 100%" />
            </a-form-model-item>
          </a-col>
          <a-col :span="24">
            <a-form-model-item label="租户号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="tenantId">
              <a-input v-model="model.tenantId"placeholder="请输入租户号" ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>
    </a-spin>
  </j-modal>
</template>

<script>

  import { httpAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'

  export default {
    name: "PreparationOrderDetailModal",
    components: {
    },
    props:{
      mainId:{
        type:String,
        required:false,
        default:''
      }
    },
    data () {
      return {
        title:"操作",
        width:800,
        visible: false,
        model:{
        },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },

        confirmLoading: false,
        validatorRules: {
        },
        url: {
          add: "/tms/preparationOrder/addPreparationOrderDetail",
          edit: "/tms/preparationOrder/editPreparationOrderDetail",
        }

      }
    },
    created () {
    //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
      add () {
        this.edit(this.modelDefault);
      },
      edit (record) {
        this.model = Object.assign({}, record);
        this.visible = true;
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
            }
            this.model['preparationOrderId'] = this.mainId
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false
          }
        })
      },
      handleCancel () {
        this.close()
      },


    }
  }
</script>

 src/views/tms/modules/preparationOrder/PreparationOrderModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,328 @@
<template>
  <j-modal
    :title="title"
    :width="width"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="准备单编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="preparationOrderNum">
              <a-input v-model="model.preparationOrderNum" placeholder="请输入准备单编号" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="零件图号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partDrawingNo">
              <a-input v-model="model.partDrawingNo" placeholder="请输入零件图号" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="零件名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partName">
              <a-input v-model="model.partName" placeholder="请输入零件名称" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input v-model="model.partMaterial" placeholder="请输入零件材料" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="工序（工步号）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productionProcessesNo">
              <a-input v-model="model.productionProcessesNo" placeholder="请输入工序（工步号）" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="加工批次" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="batchCode">
              <a-input v-model="model.batchCode" placeholder="请输入加工批次" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="加工设备" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentCode">
              <a-input v-model="model.equipmentCode" placeholder="请输入加工设备" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="程序名" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="ncName">
              <a-input v-model="model.ncName" placeholder="请输入程序名" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="加工数量" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="machiningCount">
              <a-input v-model="model.machiningCount" placeholder="请输入加工数量" disabled></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-textarea :disable="disableSubmit" v-model="model.remark" placeholder="请输入备注" ></a-textarea>
            </a-form-model-item>
          </a-col>
        </a-row>
      </a-form-model>

      <a-table
        ref="table"
        size="middle"
        bordered
        rowKey="id"
        :scroll="{x:true}"
        :columns="columns"
        :dataSource="dataSource"
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="null">

        <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 === 'outboundQuantity'"
              :value="text"
              @change="(e) => handleChange(e, record.key, col, index)"
              :min="1"
            />
          </div>
        </template>
        <span slot="action" v-if="disableSubmit === false" slot-scope="text, record, index">
        <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record, index)">
          <a>删除</a>
        </a-popconfirm>
      </span>

      </a-table>
    </a-spin>

    <template slot="footer">
      <a-button :style="{ marginRight: '8px' }" @click="handleCancel">关闭</a-button>
      <a-button @click="handleOk" v-if="disableSubmit === false" type="primary">确定</a-button>
    </template>
  </j-modal>
</template>

<script>

  import { httpAction } from '@/api/manage'
  import { validateDuplicateValue } from '@/utils/util'
  import { getAction } from '../../../../api/manage'

  export default {
    name: "PreparationOrderModal",
    components: {
    },
    data () {
      return {
        title: "操作",
        width: 1200,
        visible: false,
        model:{
        },
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },
        loading: false,
        dataSource: [],
        /* åˆ†é¡µå‚æ•° */
        ipagination:{
          current: 1,
          pageSize: 10,
          pageSizeOptions: ['10', '20', '30'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " å…±" + total + "条"
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
          },
          {
            title:'工具编码',
            align:"left",
            dataIndex: 'toolNum'
          },
          {
            title:'工具类型',
            align:"center",
            dataIndex: 'applicationType_dictText'
          },
          {
            title:'中文名称',
            align:"center",
            dataIndex: 'chineseName'
          },
          {
            title:'型号/图号',
            align:"left",
            dataIndex: 'toolModel'
          },
          {
            title:'刀具材料',
            align:"center",
            dataIndex: 'toolMaterial'
          },
          {
            title:'零件材料',
            align:"center",
            dataIndex: 'partMaterial'
          },
          {
            title:'厂家',
            align:"center",
            dataIndex: 'supplierId'
          },
          {
            title:'出库数量',
            align:"left",
            dataIndex: 'outboundQuantity',
            scopedSlots: { customRender: 'outboundQuantity' }
          },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            fixed:"right",
            width:147,
            scopedSlots: { customRender: 'action' },
          }
        ],
        confirmLoading: false,
        validatorRules: {
           outboundQuantity: [
              { required: true, message: '请输入准备单出库数量!'},
           ],
           orderStatus: [
              { required: true, message: '请输入单子状态;1.未审核；2.调机员已审核；3.已转出库申请!'},
           ],
           outboundTime: [
              { required: true, message: '请输入准备单提交时间;提交至出库申请单的时间!'},
           ],
        },
        url: {
          list: "/tms/preparationOrder/listPreparationOrderDetailByMainId",
          add: "/tms/preparationOrder/add",
          edit: "/tms/preparationOrder/editTotal",
          delete: "/tms/preparationOrder/deletePreparationOrderDetail"
        }

      }
    },
    created () {
    //备份model原始值
      this.modelDefault = JSON.parse(JSON.stringify(this.model));
    },
    methods: {
      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
          if(column.dataIndex === 'outboundQuantity'){
            if(target['quantity']<value){
              this.$message.error('申请出库数量不能大于可用库存!')
              this.isDisabled = true
            }else{
              this.isDisabled = false
            }
          }
          this.dataSource = temp
        }
      },
      add () {
        this.edit(this.modelDefault);
      },
      edit (record) {
        this.model = Object.assign({}, record);
        getAction(this.url.list, { preparationOrderId: record.id}).then(res => {
          if (res.success) {
            this.dataSource = res.result.records || res.result;
            if (res.result.total)
            {
              this.ipagination.total = res.result.total;
            } else {
              this.ipagination.total = 0;
            }
          } else {
            this.$message.warning(res.message)
          }
        })
        this.visible = true;
      },
      handleDelete(record, index) {
        deleteAction(this.url.delete, { id: record.id }).then((res) => {
          if (res.success) {
            this.dataSource.splice(index, 1);
            this.$message.success(res.message)
          } else {
            this.$message.warning(res.message)
          }
        });
      },
      close () {
        this.$emit('close');
        this.visible = false;
        this.$refs.form.clearValidate();
      },
      handleOk () {
        const that = this;
        // è§¦å‘表单验证
        this.$refs.form.validate(valid => {
          if (valid) {
            that.confirmLoading = true;
            let httpurl = '';
            let method = '';
            this.model.preparationOrderDetailList = this.dataSource
            if(!this.model.id){
              httpurl+=this.url.add;
              method = 'post';
            }else{
              httpurl+=this.url.edit;
               method = 'put';
               if (this.title === '审核') {
                 this.model.orderStatus = '2';
               }
            }
            console.log(this.model)
            httpAction(httpurl,this.model,method).then((res)=>{
              if(res.success){
                that.$message.success(res.message);
                that.$emit('ok');
              }else{
                that.$message.warning(res.message);
              }
            }).finally(() => {
              that.confirmLoading = false;
              that.close();
            })
          }else{
             return false
          }
        })
      },
      handleCancel () {
        this.close()
      },


    }
  }
</script>

 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,