src/views/dashboard/SyncProcessList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,228 @@
<template>
  <div class="sync-process-container">
    <a-spin :spinning="loading">
      <a-table
        :columns="columns"
        :data-source="syncProcessList"
        rowKey="id"
        :pagination="false"
        class="process-table"
        :scroll="{ y: 400 }"
      >

        <span slot="action" slot-scope="text, record">
          <a-popconfirm title="确定领取吗?" @confirm="() => handleInspection(record.id)">
            <a>领取</a>
          </a-popconfirm>
        </span>
      </a-table>
    </a-spin>

    <!-- è¡¨å•åŒºåŸŸ -->
    <syncProcessSpecificationInfo-modal ref="modalForm" @ok="modalFormOk"></syncProcessSpecificationInfo-modal>
  </div>
</template>

<script>
import '@/assets/less/TableExpand.less'
import SyncProcessSpecificationInfoModal from '../dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'

export default {
  name: "SyncProcessSpecificationInfoList",
  mixins: [JeecgListMixin],
  components: {
    SyncProcessSpecificationInfoModal
  },
  data() {
    return {
      syncProcessList: [],
      url: {
        list: '/dnc/home/syncProcessSpecificationInfo',
        isSameNode: '/assign/flow/isSameNode',
        receiveInspectionOrder:"/dnc/home/receiveTree"
      },
      // è¡¨æ ¼åˆ—配置
      columns: [
        {
          title: '产品代号',
          align: "center",
          dataIndex: 'productCode',
          scopedSlots: { customRender: 'productCode' },
          width: '10%'
        },
        {
          title: '部件名称',
          align: "center",
          dataIndex: 'partName',
        },
        {
          title: '部件编号',
          align: "center",
          dataIndex: 'partNumber',
        },
        {
          title: '部件版本',
          align: "center",
          dataIndex: 'partVersion',
        },
        {
          title: '工艺规程编号',
          align: "center",
          dataIndex: 'planNumber',
        },
        {
          title: '工艺规程版本',
          align: "center",
          dataIndex: 'planVersion',
        },
        {
          title: '发布时间',
          align: "center",
          dataIndex: 'createTime'
        },
        {
          title: '操作',
          align: "center",
          scopedSlots: { customRender: 'action' },
        }
      ]
    };
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
  methods: {
    handleReceive(item) {
      console.log('领取任务', item);
      // å®žé™…业务中调用领取接口
      this.$message.success('任务领取成功');
      // æ›´æ–°æœ¬åœ°æ•°æ®çŠ¶æ€
      this.syncProcessList = this.syncProcessList.map(i =>
        i.id === item.id ? {...i, isReceive: true} : i
      );
    },
    loadData() {
      this.syncProcessList = [];
      if (!this.url.list) {
        this.$message.error('请设置url.list属性!');
        return;
      }
      this.loading = true;
      getAction(this.url.list).then((res) => {
        if (res.success) {
          // ä½¿ç”¨çœŸå®žæŽ¥å£æ•°æ®
          this.syncProcessList = res.result.records || res.result;
        } else {
          this.$message.warning(res.message);
        }
      }).finally(() => {
        this.loading = false;
      });
    },
    /**
     * é¢†å–
     * @param id
     */
    handleInspection(id) {
      var that = this
      this.loading = true
      getAction(that.url.receiveInspectionOrder, { id })
        .then((res) => {
          if (res.success) {
            that.$notification.success({
              message: '消息',
              description: res.message
            })
            that.loadData()
          } else {
            that.$notification.warning({
              message: '消息',
              description: res.message
            })
            this.loading = false
          }
        })
    },
  },
  mounted() {
    this.loadData();
  }
}
</script>

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

.sync-process-container {
  padding: 16px;
  background-color: #fff;
  border-radius: 8px;
  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.09);
  height: 500px;
  display: flex;
  flex-direction: column;
}

.table-header {
  display: flex;
  justify-content: space-between;
  align-items: center;
  margin-bottom: 16px;
  flex-shrink: 0;
}

.table-title {
  font-size: 16px;
  font-weight: 600;
  color: #1d2129;
}

.more-button {
  background-color: #1890ff;
  border-color: #1890ff;
  font-weight: 500;
}

.more-button:hover {
  background-color: #40a9ff;
  border-color: #40a9ff;
}

/* è¡¨æ ¼æ ·å¼ */
.process-table {
  flex: 1;
  overflow: hidden;
}

/* äº§å“ä»£å·é“¾æŽ¥æ ·å¼ */
.process-table >>> .ant-table-tbody a {
  color: #1890ff;
  transition: color 0.3s;
  font-weight: 500;
}

.process-table >>> .ant-table-tbody a:hover {
  color: #40a9ff;
  text-decoration: underline;
}

/* æ“ä½œæŒ‰é’®æ ·å¼ */
.process-table >>> .ant-btn-link {
  padding: 0 4px;
}

/* è¡¨æ ¼è¡Œæ‚¬åœæ•ˆæžœ */
.process-table >>> .ant-table-row:hover td {
  background-color: #f0f8ff !important;
  cursor: pointer;
}

/* è¡¨æ ¼æ»šåŠ¨åŒºåŸŸæ ·å¼ */
.process-table >>> .ant-table-body {
  overflow-y: auto !important;
}
</style>

 src/views/dashboard/dncIndex/DncManagerSignage.vue

@@ -20,8 +20,12 @@
    <!-- å³ä¾§ä¸¤ä¸ªå°å¡ç‰‡ -->
    <div class="right-cards">
      <div class="card top-card">
        <h2 class="card-title">卡片1</h2>
        <h2 class="card-title">三维工艺生成产品结构树</h2>
        <h2 class="more-btns" @click = "gotoSyncProcessList">更多</h2>
        <div class="card-content">
          <syncProcessList
            ref="syncProcessList"
            ></syncProcessList>
        </div>
      </div>

@@ -36,11 +40,14 @@

<script>
import TodoList from '@views/dashboard/TodoList.vue'
import SyncProcessList from '@views/dashboard/SyncProcessList.vue'


export default {
  name: 'DncManagerSignage',
  components: {
    TodoList
    TodoList,
    SyncProcessList
  },
  data() {
    return {
@@ -56,7 +63,10 @@
  methods: {
    gotoTodoList() {
      this.$router.push('/flowable/workflow/FlowTodo')
    }
    },
    gotoSyncProcessList(){
      this.$router.push('/dnc/base/SyncProcessSpecificationInfoList')
    },
  }
}
</script>
@@ -116,6 +126,19 @@
  border: none;
  cursor: pointer;
}

.more-btns {
  position: absolute;
  top: 140px;
  right: 40px;
  color: #1890ff;
  font-size: 14px;
  background: none;
  border: none;
  cursor: pointer;
  text-decoration: none;
  z-index: 10;
}
.top-card {
  flex: 1;
}

 src/views/dnc/base/SyncProcessSpecificationInfoList.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,192 @@
<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.productName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="产品代号">
              <a-input placeholder="请输入产品代号" v-model="queryParam.productCode"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="部件名称">
              <a-input placeholder="请输入部件名称" v-model="queryParam.partName"></a-input>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="部件编号">
              <a-input placeholder="请输入部件编号" v-model="queryParam.partNumber"></a-input>
            </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>
            </span>
          </a-col>

        </a-row>
      </a-form>
    </div>

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

    <!-- table区域-begin -->
    <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-popconfirm title="确定领取吗?" @confirm="() => handleInspection(record.id)">
            <a>领取</a>
          </a-popconfirm>
        </span>

      </a-table>
    </div>
    <!-- table区域-end -->

    <!-- è¡¨å•åŒºåŸŸ -->
    <syncProcessSpecificationInfo-modal ref="modalForm" @ok="modalFormOk"></syncProcessSpecificationInfo-modal>
  </a-card>
</template>

<script>
  import '@assets/less/TableExpand.less'
  import SyncProcessSpecificationInfoModal from './modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import { getAction } from '@api/manage'

  export default {
    name: "SyncProcessSpecificationInfoList",
    mixins:[JeecgListMixin],
    components: {
      SyncProcessSpecificationInfoModal
    },
    data () {
      return {
        description: '三维工艺工艺规程信息管理页面',
        // è¡¨å¤´
        columns: [
          {
            title: '#',
            dataIndex: '',
            key:'rowIndex',
            width:60,
            align:"center",
            customRender:function (t,r,index) {
              return parseInt(index)+1;
            }
           },
          {
            title: '产品名称',
            align:"center",
            dataIndex: 'productName'
          },
              {
            title: '产品代号',
            align:"center",
            dataIndex: 'productCode'
           },
              {
            title: '部件名称',
            align:"center",
            dataIndex: 'partName'
           },
              {
            title: '部件编号',
            align:"center",
            dataIndex: 'partNumber'
           },
              {
            title: '部件版本',
            align:"center",
            dataIndex: 'partVersion'
           },
              {
            title: '工艺规程编号',
            align:"center",
            dataIndex: 'planNumber'
           },
              {
            title: '工艺规程版本',
            align:"center",
            dataIndex: 'planVersion'
           },
              {
            title: '是否领取',
            align:"center",
            dataIndex: 'isReceive_dictText'
           },
              {
            title: '发布时间',
            align:"center",
            dataIndex: 'createTime'
           },
          {
            title: '操作',
            dataIndex: 'action',
            align:"center",
            scopedSlots: { customRender: 'action' },
          }
        ],
        url: {
          list: "/dnc/home/syncProcessSpecificationInfo",
          receiveInspectionOrder:"/dnc/home/receiveTree"
       },
    }
  },
  computed: {
    importExcelUrl: function(){
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
    }
  },
    methods: {
      /**
       * é¢†å–
       * @param id
       */
      handleInspection(id) {
        var that = this
        this.loading = true
        getAction(that.url.receiveInspectionOrder, { id })
          .then((res) => {
            if (res.success) {
              that.$notification.success({
                message: '消息',
                description: res.message
              })
              that.loadData()
            } else {
              that.$notification.warning({
                message: '消息',
                description: res.message
              })
              this.loading = false
            }
          })
      },
    }
  }
</script>
<style scoped>
  @import '~@assets/less/common.less';
</style>

 src/views/dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.Style#Drawer.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,158 @@
<template>
  <a-drawer
      :title="title"
      :width="800"
      placement="right"
      :closable="false"
      @close="close"
      :visible="visible">

    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dataType" label="数据类型">
          <a-input placeholder="请输入数据类型" v-model="model.dataType" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="changeNo" label="更改单号">
          <a-input placeholder="请输入更改单号" v-model="model.changeNo" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partName" label="部件名称">
          <a-input placeholder="请输入部件名称" v-model="model.partName" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber" label="部件编号">
          <a-input placeholder="请输入部件编号" v-model="model.partNumber" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partVersion" label="部件版本">
          <a-input placeholder="请输入部件版本" v-model="model.partVersion" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planNumber" label="工艺规程编号">
          <a-input placeholder="请输入工艺规程编号" v-model="model.planNumber" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planVersion" label="工艺规程版本">
          <a-input placeholder="请输入工艺规程版本" v-model="model.planVersion" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isReceive" label="是否领取">
          <a-input placeholder="请输入是否领取" v-model="model.isReceive" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createDate" label="发布时间">
          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.createDate" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jsonData" label="json字符串信息">
          <a-input placeholder="请输入json字符串信息" v-model="model.jsonData" />
        </a-form-model-item>

      </a-form-model>
    </a-spin>

    <div class="drawer-bootom-button">
      <a-button type="primary" @click="handleOk">确定</a-button>
      <a-button type="primary" @click="handleCancel">取消</a-button>
    </div>
  </a-drawer>
</template>

<script>
  import { httpAction } from '@api/manage'
  import moment from "moment"

  export default {
    name: "SyncProcessSpecificationInfoModal",
    data () {
      return {
        title:"操作",
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },

        confirmLoading: false,
        validatorRules:{
        },
        url: {
          add: "/dnc/syncProcessSpecificationInfo/add",
          edit: "/dnc/syncProcessSpecificationInfo/edit",
        },
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      },
      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';
            }
            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>

<style lang="less" scoped>
  /**Button按钮间距*/
  .ant-btn {
    margin-left: 30px;
    margin-bottom: 30px;
    float: right;
  }
 /**抽屉按钮样式*/
  .drawer-bootom-button {
    position: absolute;
    bottom: -8px;
    width: 100%;
    border-top: 1px solid #e8e8e8;
    padding: 10px 16px;
    text-align: right;
    left: 0;
    background: #fff;
    border-radius: 0 0 2px 2px;
  }
</style>

 src/views/dnc/base/modules/SyncProcessSpecificationInfo/SyncProcessSpecificationInfoModal.vue

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :visible="visible"
    :confirmLoading="confirmLoading"
    switchFullscreen
    @ok="handleOk"
    @cancel="handleCancel"
    cancelText="关闭">

    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :rules="validatorRules">

        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dataType" label="数据类型">
          <a-input placeholder="请输入数据类型" v-model="model.dataType" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="changeNo" label="更改单号">
          <a-input placeholder="请输入更改单号" v-model="model.changeNo" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partName" label="部件名称">
          <a-input placeholder="请输入部件名称" v-model="model.partName" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partNumber" label="部件编号">
          <a-input placeholder="请输入部件编号" v-model="model.partNumber" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partVersion" label="部件版本">
          <a-input placeholder="请输入部件版本" v-model="model.partVersion" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planNumber" label="工艺规程编号">
          <a-input placeholder="请输入工艺规程编号" v-model="model.planNumber" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="planVersion" label="工艺规程版本">
          <a-input placeholder="请输入工艺规程版本" v-model="model.planVersion" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="isReceive" label="是否领取">
          <a-input placeholder="请输入是否领取" v-model="model.isReceive" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="createDate" label="发布时间">
          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.createDate" />
        </a-form-model-item>
        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="jsonData" label="json字符串信息">
          <a-input placeholder="请输入json字符串信息" v-model="model.jsonData" />
        </a-form-model-item>

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

<script>
  import { httpAction } from '@api/manage'
  import moment from "moment"

  export default {
    name: "SyncProcessSpecificationInfoModal",
    data () {
      return {
        title:"操作",
        visible: false,
        model: {},
        labelCol: {
          xs: { span: 24 },
          sm: { span: 5 },
        },
        wrapperCol: {
          xs: { span: 24 },
          sm: { span: 16 },
        },

        confirmLoading: false,
        validatorRules:{
        },
        url: {
          add: "/dnc/syncProcessSpecificationInfo/add",
          edit: "/dnc/syncProcessSpecificationInfo/edit",
        },
      }
    },
    created () {
    },
    methods: {
      add () {
        //初始化默认值
        this.edit({});
      },
      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';
            }
            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>

<style lang="less" scoped>

</style>

 src/views/eam/equipment/EamEquipmentList.vue

@@ -96,7 +96,83 @@
                </a-tree-select>
              </a-form-item>
            </a-col>

            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
            <a-form-item label="机床厂家">
              <a-input
                placeholder="请输入机床厂家"
                v-model="queryParam.manufacturingEnterprise"
              ></a-input>
            </a-form-item>
            </a-col>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
            <a-form-item label="原值(元)">
              <a-input
                placeholder="请输入原值(元)"
                v-model="queryParam.originalValue"
              ></a-input>
            </a-form-item>
            </a-col>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
            <a-form-item label="性能指标">
              <a-input
                placeholder="请输入性能指标"
                v-model="queryParam.performanceIndicators"
              ></a-input>
            </a-form-item>
            </a-col>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
              <a-form-item label="出厂日期">
                <a-range-picker v-model="leaveFactoryDate" value-format="YYYY-MM-DD HH:mm:ss"
                                @change="leaveFactoryRangeChange"
                                style="width: 100%"/>
              </a-form-item>
            </a-col>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
              <a-form-item label="投用日期">
                <a-range-picker v-model="acceptanceCheckDate" value-format="YYYY-MM-DD"
                                @change="acceptanceCheckRangeChange"
                                style="width: 100%"/>
              </a-form-item>
            </a-col>
            <a-col
              :xl="6"
              :lg="7"
              :md="8"
              :sm="24"
            >
              <a-form-item label="设备用途">
                <j-dict-select-tag
                  dict-code="equipment_use"
                  placeholder="请选择设备用途"
                  v-model="queryParam.equipmentUse"
                ></j-dict-select-tag>
              </a-form-item>
            </a-col>
          </template>
          <a-col
            :xl="6"
@@ -451,16 +527,33 @@
          fixed: 'left'
        },
        {
          title: '管理分类',
          title: '设备型号',
          align: 'center',
          width: 120,
          dataIndex: 'equipmentImportance_dictText',
          width: 200,
          dataIndex: 'equipmentModel'
        },
        {
          title: '技术状态',
          title: '出厂日期',
          align: 'center',
          width: 100,
          dataIndex: 'technologyStatus_dictText'
          dataIndex: 'leaveFactoryDate'
        },
        {
          title: '投用日期',
          align: 'center',
          width: 100,
          dataIndex: 'acceptanceCheckDate'
        },
        {
          title: '原值(元)',
          align: 'center',
          dataIndex: 'originalValue'
        },
        {
          title: '使用车间',
          align: 'center',
          width: 100,
          dataIndex: 'orgId_dictText'
        },
        {
          title: '资产使用状态',
@@ -481,13 +574,31 @@
          dataIndex: 'maintenanceStatus_dictText'
        },
        {
          title: '使用车间',
          title: '设备用途',
          align: 'center',
          width: 100,
          dataIndex: 'orgId_dictText'
          dataIndex: 'equipmentUse_dictText'
        },
        {
          title: '设备管理员',
          title: '操作工',
          align: 'center',
          width: 100,
          dataIndex: 'operator'
        },
        {
          title: '管理分类',
          align: 'center',
          width: 120,
          dataIndex: 'equipmentImportance_dictText',
        },
        {
          title: '技术状态',
          align: 'center',
          width: 100,
          dataIndex: 'technologyStatus_dictText'
        },
        {
          title: '设备责任人',
          align: 'center',
          width: 100,
          dataIndex: 'equipmentManager_dictText'
@@ -501,12 +612,6 @@
          title: '设备种类',
          align: 'center',
          dataIndex: 'equipmentType_dictText'
        },
        {
          title: '设备型号',
          align: 'center',
          width: 200,
          dataIndex: 'equipmentModel'
        },
        {
          title: '设备规格',
@@ -562,18 +667,6 @@
          dataIndex: 'supplier'
        },
        {
          title: '出厂日期',
          align: 'center',
          width: 100,
          dataIndex: 'leaveFactoryDate'
        },
        {
          title: '投用日期',
          align: 'center',
          width: 100,
          dataIndex: 'acceptanceCheckDate'
        },
        {
          title: '有无工艺参数',
          align: 'center',
          width: 120,
@@ -591,11 +684,6 @@
          title: '外形尺寸',
          align: 'center',
          dataIndex: 'overallDimensions'
        },
        {
          title: '原值(元)',
          align: 'center',
          dataIndex: 'originalValue'
        },
        {
          title: '资金来源',
@@ -671,6 +759,8 @@
      isOpenProcess: false,
      isOpenPrecision: false,
      treeDataAlias: [],
      leaveFactoryDate: [],
      acceptanceCheckDate: [],
    }
  },
  computed: {
@@ -683,6 +773,14 @@
    this.loadAppHomeUrlConfigValue()
  },
  methods: {
    leaveFactoryRangeChange(valueArray) {
      this.queryParam.leaveFactoryStartTime = valueArray[0]
      this.queryParam.leaveFactoryEndTime = valueArray[1]
    },
    acceptanceCheckRangeChange(valueArray) {
      this.queryParam.acceptanceCheckStartTime = valueArray[0]
      this.queryParam.acceptanceCheckEndTime = valueArray[1]
    },
    loadAllProductionTree() {
      //加载车间选择树
      getAction(this.url.loadProductionOptions).then(res => {
@@ -831,8 +929,9 @@
      }
      return newObj;
    },

    searchReset() {
      this.leaveFactoryDate = []
      this.acceptanceCheckDate = []
      this.queryParam = {}
      this.onClearSelected()
      this.loadTabPaneTableData('-1')

 src/views/eam/equipment/modules/EamEquipmentFluidList.vue

@@ -25,6 +25,27 @@
      <vxe-table-column title="油液名称" field="fluidId" align="center"
                        :edit-render="{name : '$select', options: fluidList, optionProps: {label:'fluidName', value:'id'}, props: {clearable:true}, events: {change:handleParamSelectChange}}"></vxe-table-column>
      <vxe-table-column title="参数编码" field="fluidCode" align="center"></vxe-table-column>
      <vxe-table-column title="使用数量" field="usageQuantity" align="center"
                        :edit-render="{name: '$input',props: {type: 'number',min: 0,step: 1,precision: 0 }}"></vxe-table-column>
      <vxe-table-column title="加入部位" field="additionSite" align="center" :edit-render="{name : '$input'}"></vxe-table-column>
      <vxe-table-column
        title="时间"
        field="oilTime"
        align="center"
        :edit-render="{
    name: 'ADatePicker',
    props: {
      type: 'datetime',
      format: 'YYYY-MM-DD HH:mm:ss',
      valueFormat: 'YYYY-MM-DD HH:mm:ss'
    },
    events: {
      change: (value, context) => {
        context.row.oilTime = value
      }
    }
  }":formatter="formatDate"
      ></vxe-table-column>
      <vxe-table-column title="操作" width="160">
        <template v-slot="{row}">
          <template v-if="hasEditStatus(row)">
@@ -93,6 +114,15 @@
    this.loadFluidList()
  },
  methods: {
    formatDate({ cellValue }) {
      // æ£€æŸ¥æ˜¯å¦ä¸ºæœ‰æ•ˆçš„日期对象
      if (cellValue && (cellValue instanceof Date || !isNaN(Date.parse(cellValue)))) {
        const date = cellValue instanceof Date ? cellValue : new Date(cellValue);
        // æ‰‹åŠ¨æ ¼å¼åŒ–日期
        return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')} ${date.getHours().toString().padStart(2, '0')}:${date.getMinutes().toString().padStart(2, '0')}:${date.getSeconds().toString().padStart(2, '0')}`;
      }
      return cellValue; // éžæ—¥æœŸç±»åž‹ç›´æŽ¥è¿”回原值
    },
    handleParamSelectChange($event, value) {
      console.log(value)
      let parameter = this.fluidList.find(item => item.id === value.value)

 src/views/eam/equipment/modules/EamEquipmentModal.vue

@@ -127,6 +127,17 @@
                                 disabled/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="equipmentUse" label="设备用途">
              <j-dict-select-tag dict-code="equipment_use" v-model="model.equipmentUse"
                                 placeholder="请选择设备用途" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="operator" label="操作工">
              <a-input :placeholder="disableSubmit?'':'请输入操作工'" v-model="model.operator" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-divider orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> å‡ºåŽ‚信息
@@ -197,8 +208,8 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item prop="equipmentManager" label="设备管理员">
              <j-search-select-tag  placeholder="请选择设备管理员" v-model="model.equipmentManager" dict="sys_user,realname, username, del_flag=0 and post='PCR0004' and status=1" :disabled="disableSubmit"/>
            <a-form-model-item prop="equipmentManager" label="设备责任人">
              <j-search-select-tag  placeholder="请选择设备责任人" v-model="model.equipmentManager" dict="sys_user,realname, username, del_flag=0 and post='PCR0004' and status=1" :disabled="disableSubmit"/>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -280,7 +291,7 @@
          { required: true, message: '请选择使用车间' }
        ],
        equipmentManager: [
          { required: true, message: '请选择设备管理员' }
          { required: true, message: '请选择设备责任人' }
        ],
        deviceType: [
          { required: false, message: '请选择设备类型' }

 src/views/flowable/workflow/lossBound/lossBoundHandle.vue

@@ -40,13 +40,20 @@
                      </a-form-model-item>
                    </a-col>
                    <a-col :span="span">
                      <a-form-model-item label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handler">
                        <j-dict-select-tag disabled
                                           v-model="tableRowRecord.handler" dictCode="sys_user,realname,id"
                                           placeholder="请选择" />
                      </a-form-model-item>
                    </a-col>
                    <!-- <a-col :span="span">
                      <a-form-model-item label="报损人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                                         prop="outStorehouseType">
                        <j-dict-select-tag disabled
                                           v-model="tableRowRecord.losser" dictCode="sys_user,realname,id"
                                           placeholder="请选择" />
                      </a-form-model-item>
                    </a-col>
                    </a-col> -->
                  </a-row>
                  <a-row>
                    <a-col :span="span">
@@ -64,16 +71,10 @@
                    </a-col>
                  </a-row>
                  <a-row>
                    <a-col :span="span">
                      <a-form-model-item label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handler">
                        <j-dict-select-tag disabled
                                           v-model="tableRowRecord.handler" dictCode="sys_user,realname,id"
                                           placeholder="请选择" />
                      </a-form-model-item>
                    </a-col>
                    <a-col :span="span">
                      <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
                        <a-textarea disabled v-model="tableRowRecord.remark" rows="4" />
                    
                    <a-col :span="24">
                      <a-form-model-item label="备注" :labelCol="{span:2}" :wrapperCol="{span:20}" prop="remark">
                        <a-textarea disabled v-model="tableRowRecord.remark" rows="2" />
                      </a-form-model-item>
                    </a-col>
                  </a-row>
@@ -118,8 +119,8 @@
        <a-form-model ref="form" :model="approveData" :rules="validatorRules" slot="detail">
          <a-row>
            <a-col ::span="span">
              <a-form-model-item label="申请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handler_dictText">
                <a-input :readOnly="inputReadOnly" v-model="tableRowRecord.handler_dictText"></a-input>
              <a-form-model-item label="申请人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handlePerson">
                <a-input :readOnly="inputReadOnly" v-model="tableRowRecord.handlePerson"></a-input>
              </a-form-model-item>
            </a-col>
            <a-col ::span="span">
@@ -235,7 +236,7 @@
        {
          title: '刀具编号',
          align: 'center',
          dataIndex: 'toolCode'
          dataIndex: 'toolId'
        },
        {
          title: '工具类型',

 src/views/tms/combinationKnife/ToolCombinationList.vue

@@ -69,7 +69,7 @@
        </template>

        <span slot='action' slot-scope='text, record'>
              <a-popconfirm title='确定拆卸吗?' @confirm='() => handleDelete(record.id)'>
              <a-popconfirm title='确定拆卸吗?' v-if="record.status == '1'" @confirm='() => handleDelete(record.id)'>
                  <a>刀具拆卸</a>
                </a-popconfirm>
        </span>

 src/views/tms/lossBound/modules/LossboundModal.vue

@@ -13,16 +13,19 @@
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="报损单单号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="orderCode">
              <j-input v-model="model.orderCode" placeholder="系统自动生成" :disabled="true"></j-input>
              <a-input v-model="model.orderCode" placeholder="系统自动生成" :disabled="true"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="报损人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="losser">
              <j-dict-select-tag :disabled="disableSubmit"
                                 v-model="model.losser" dictCode="sys_user,realname,id"
           <a-col :span="12">
            <a-form-model-item label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="handler">

              <j-dict-select-tag :disabled="true"
                                 v-model="model.handler" dictCode="sys_user,realname,id"
                                 placeholder="请选择" />
            </a-form-model-item>
          </a-col>
         
        </a-row>
        <a-row>
          <a-col :span="12">
@@ -43,16 +46,14 @@
          </a-col>
        </a-row>
        <a-row>

          <a-col :span="12">
            <a-form-model-item v-if="addShow" label="经手人" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="handler">

 <!-- <a-col :span="12">
            <a-form-model-item label="报损人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="losser">
              <j-dict-select-tag :disabled="disableSubmit"
                                 v-model="model.handler" dictCode="sys_user,realname,id"
                                 v-model="model.losser" dictCode="sys_user,realname,id"
                                 placeholder="请选择" />
            </a-form-model-item>
          </a-col>
          </a-col> -->
         
          <a-col :span="12">
            <a-form-model-item v-if="addShow" label="审核状态" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="orderStatus">
@@ -60,9 +61,7 @@
                                 placeholder="请选择审核状态" disabled />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
           <a-col :span="12">
            <a-form-model-item v-if="addShow" label="审核时间" :labelCol="labelCol" :wrapperCol="wrapperCol"
                               prop="approvalDate">

@@ -72,8 +71,8 @@
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item v-if="addShow" label="审核意见" :labelCol="labelCol" :wrapperCol="wrapperCol"
          <a-col :span="24">
            <a-form-model-item v-if="addShow" label="审核意见" :labelCol="{span:2}" :wrapperCol="{span:20}"
                               prop="approvalOpinion">
              <a-input v-model="model.approvalOpinion" placeholder="请输入审核意见" disabled></a-input>
            </a-form-model-item>
@@ -81,15 +80,13 @@
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-textarea :disabled="disableSubmit" v-model="model.remark" rows="4" placeholder="请输入备注" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="报损原因" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="lossReason">
              <a-textarea :disabled="disableSubmit" v-model="model.lossReason" rows="4" placeholder="请输入报损原因" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="remark">
              <a-textarea :disabled="disableSubmit" v-model="model.remark" rows="4" placeholder="请输入备注" />
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -115,9 +112,9 @@
      <template v-for="col in columns" :slot="col.dataIndex" slot-scope="text, record, index">
        <div v-if="col.dataIndex == 'lossNumber'">
          <a-input-number
            :disabled="disableSubmit"
            :disabled="record.accuracyClass === '1'"
            :value="text"
            :min="0"
            :min="1"
            :max="99999"
            @change="(e) => handleChange(e, record.key, col, index)"
            style="width: 100%;"
@@ -327,9 +324,10 @@
          goodsShelvesId: data[i].positionCode,
          toolMaterial: data[i].toolMaterial,
          partMaterial: data[i].partMaterial,
          lossNumber: null, // åˆå§‹åŒ–报损数量
          lossNumber: "1", // åˆå§‹åŒ–报损数量
          lossNumberError: false, // æ ¡éªŒçŠ¶æ€
          lossNumberMsg: '' // é”™è¯¯ä¿¡æ¯
          lossNumberMsg: '', // é”™è¯¯ä¿¡æ¯
          accuracyClass: data[i].accuracyClass
        })
      }
      this.ipagination.total = this.dataSource.length

 src/views/tms/modules/WarehouseForm.vue

@@ -24,10 +24,10 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="叶子节点标识" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
              <a-radio-group :disabled="leafDisableFlag" v-model="model.leafFlag" placeholder="请选择是否叶子节点">
                <a-radio :value="'2'">有子节点</a-radio>
                <a-radio :value="'1'">是叶子节点</a-radio>
            <a-form-model-item label="是否有下级分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
              <a-radio-group :disabled="leafDisableFlag" v-model="model.leafFlag" placeholder="请选择是否有下级分类">
                <a-radio :value="'2'">是</a-radio>
                <a-radio :value="'1'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
@@ -90,7 +90,7 @@
              { required: true, message: '请输入父节点编号!'},
           ],
           leafFlag: [
              { required: true, message: '请输入是否叶子节点!'},
              { required: true, message: '请输入是否有下级分类!'},
           ],
            seq: [
              { validator: (rule, value, callback) => {

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

@@ -24,10 +24,10 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="是否为叶子节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
              <a-radio-group v-model="model.leafFlag" placeholder="请选择是否叶子节点" @change="leafFlagChange">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
            <a-form-model-item label="是否有下级分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
              <a-radio-group v-model="model.leafFlag" placeholder="请选择是否有下级分类" @change="leafFlagChange">
                <a-radio :value="'1'">否</a-radio>
                <a-radio :value="'2'">是</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
@@ -100,7 +100,7 @@
              { required: true, message: '请输入工具分类名称!'},
           ],
           leafFlag: [
              { required: true, message: '请选择是否为叶子节点!'},
              { required: true, message: '请选择是否有下级分类!'},
           ],
            seq: [
              { min: 0, message: '展示序号不能小于0!'},

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

@@ -458,7 +458,7 @@
            //显示当前选中类型参数
            this.$refs.paraCommonToolList.getPara(res.result)
            //隐藏其他类型参数
            this.$refs.paraHoleToolsList.visable =false
            this.$refs.paraHoleToolsList.visable = false
            this.$refs.paraThreadingToolList.visable = false
            this.$refs.paraMillToolList.visable = false
            this.$refs.paraTurningToolsList.visable = false
@@ -473,28 +473,28 @@
          } else if (this.selectionRows[0].paraTypeFlag === '3') {
            this.$refs.paraThreadingToolList.getPara(res.result)
            this.$refs.paraCommonToolList.visable = false
            this.$refs.paraHoleToolsList.visable =false
            this.$refs.paraHoleToolsList.visable = false
            this.$refs.paraMillToolList.visable = false
            this.$refs.paraTurningToolsList.visable = false
            this.$refs.paraBladeList.visable = false
          } else if (this.selectionRows[0].paraTypeFlag === '4') {
            this.$refs.paraMillToolList.getPara(res.result)
            this.$refs.paraCommonToolList.visable = false
            this.$refs.paraHoleToolsList.visable =false
            this.$refs.paraHoleToolsList.visable = false
            this.$refs.paraThreadingToolList.visable = false
            this.$refs.paraTurningToolsList.visable = false
            this.$refs.paraBladeList.visable = false
          } else if (this.selectionRows[0].paraTypeFlag === '5') {
            this.$refs.paraTurningToolsList.getPara(res.result)
            this.$refs.paraCommonToolList.visable = false
            this.$refs.paraHoleToolsList.visable =false
            this.$refs.paraHoleToolsList.visable = false
            this.$refs.paraThreadingToolList.visable = false
            this.$refs.paraMillToolList.visable = false
            this.$refs.paraBladeList.visable = false
          } else if (this.selectionRows[0].paraTypeFlag === '6') {
            this.$refs.paraBladeList.getPara(res.result)
            this.$refs.paraCommonToolList.visable = false
            this.$refs.paraHoleToolsList.visable =false
            this.$refs.paraHoleToolsList.visable = false
            this.$refs.paraThreadingToolList.visable = false
            this.$refs.paraMillToolList.visable = false
            this.$refs.paraTurningToolsList.visable = false
@@ -709,114 +709,273 @@
      }
    },
    paraHoleToolsOk(data) {
      this.queryParam.chineseName = data.chineseName
      this.queryParam.foreignLanguageName = data.foreignLanguageName
      this.queryParam.standardLevel = data.standardLevel
      this.queryParam.standardCode = data.standardCode
      this.queryParam.diameter = data.diameter
      this.queryParam.coneAngle = data.coneAngle
      this.queryParam.edgeLength = data.edgeLength
      this.queryParam.totalLength = data.totalLength
      this.queryParam.toolMaterial = data.toolMaterial
      this.queryParam.partMaterial = data.partMaterial
      this.queryParam.paintcoatFlag = data.paintcoatFlag
      this.queryParam.toolPattern = data.toolPattern
      this.queryParam.handleSpecifications = data.handleSpecifications
      this.queryParam.coolingMethod = data.coolingMethod
      this.queryParam.bladeCount = data.bladeCount
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'standardLevel',
        'standardCode',
        'coneAngle',
        'edgeLength',
        'totalLength',
        'toolMaterial',
        'partMaterial',
        'paintcoatFlag',
        'toolPattern',
        'handleSpecifications',
        'coolingMethod',
        'bladeCount',
        'technicalConditions',
        'conditionsInfo',
        'toolModel',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'brand',
        'toleranceClass',
        'fitterPart',
        'connectorType',
        'smallDiameter',
        'chamferAngle',
        'effectiveLength',
        'drillDiameterRange',
        'knifeDiameter',
        'boreDiameter',
        'slotSpecification',
        'headsNumber',
        'adaptHolder',
        'guidanceLength',
        'guidanceDiameter',
        'accuracyClass',
        'types',
        'fluteForm',
        'handleForm',
        'scopeOfApplication',
        'processingmethod',
        'littleDiameter',
        'bigDiameter',
        'smallEdgeLength',
        'bigEdgeLength',
        'smallTotalLength',
        'bigTotalLength',
        'smallLatestBoringDiameter',
        'bigLatestBoringDiameter',
        'smallMaxBoringDiameter',
        'bigMaxBoringDiameter',
      ]

      fields.forEach((field) => {
        this.queryParam[field] = data[field]
      })
      this.loadData()
    },
    paraBladeOk(data) {
      this.queryParam.chineseName = data.chineseName
      this.queryParam.foreignLanguageName = data.foreignLanguageName
      this.queryParam.standardLevel = data.standardLevel
      this.queryParam.standardCode = data.standardCode
      this.queryParam.bladeShape = data.bladeShape
      this.queryParam.bladeLength = data.bladeLength
      this.queryParam.cuttingEdgeCount = data.cuttingEdgeCount
      this.queryParam.bladeThickness = data.bladeThickness
      this.queryParam.toolMaterial = data.toolMaterial
      this.queryParam.partMaterial = data.partMaterial
      this.queryParam.paintcoatFlag = data.paintcoatFlag
      this.queryParam.clampingType = data.clampingType
      this.queryParam.noseAngleR = data.noseAngleR
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
     const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'coatingMaterial',
        'processingClassify',
        'bladePosterior',
        'bladeSize',
        'cuttingEdgeCount',
        'noseAngleR',
        'dentalAngle',
        'pitch',
        'accuracyClass',
        'bladeShape',
        'clampingType',
        'toolMaterial',
        'paintcoatFlag',
        'types',
        'cuttingDirection',
        'inOutThread',
        'threadStandard',
        'smallBladeLength',
        'bigBladeLength',
        'smallBladeThickness',
        'bigBladeThickness',
        'smallBladeWide',
        'bigBladeWide',
        'smallMinInternalThread',
        'bigMinInternalThread'
      ]
      fields.forEach((field) => {
        this.queryParam[field] = data[field]
      })
      this.loadData()
    },
    paraThreadingToolOk(data) {
      this.queryParam.chineseName = data.chineseName
      this.queryParam.foreignLanguageName = data.foreignLanguageName
      this.queryParam.threadCode = data.threadCode
      this.queryParam.pitch = data.pitch
      this.queryParam.rotationDirection = data.rotationDirection
      this.queryParam.tolerancezoneLevel = data.tolerancezoneLevel
      this.queryParam.edgeLength = data.edgeLength
      this.queryParam.totalLength = data.totalLength
      this.queryParam.toolMaterial = data.toolMaterial
      this.queryParam.partMaterial = data.partMaterial
      this.queryParam.paintcoatFlag = data.paintcoatFlag
      this.queryParam.externalDimensions = data.externalDimensions
      this.queryParam.handleSpecifications = data.handleSpecifications
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'threadCode',
        'tolerancezoneLevel',
        'pitch',
        'handleSpecifications',
        'guidingSize',
        'connectionAperture',
        'connectingKeyway',
        'accuracyClass',
        'rotationDirection',
        'paintcoatFlag',
        'toolMaterial',
        'coolingMethod',
        'types',
        'screwHoleType',
        'threadStandard',
        'fluteSoltType',
        'smallExternalDimensions',
        'bigExternalDimensions',
        'smallEdgeLength',
        'bigEdgeLength',
        'smallTotalLength',
        'bigTotalLength'
      ]
      fields.forEach((field) => {
        this.queryParam[field] = data[field]
      })

      this.loadData()
    },
    paraMillToolOk(data) {
      this.queryParam.chineseName = data.chineseName
      this.queryParam.foreignLanguageName = data.foreignLanguageName
      this.queryParam.standardLevel = data.standardLevel
      this.queryParam.standardCode = data.standardCode
      this.queryParam.diameter = data.diameter
      this.queryParam.noseAngleR = data.noseAngleR
      this.queryParam.edgeLength = data.edgeLength
      this.queryParam.totalLength = data.totalLength
      this.queryParam.toolMaterial = data.toolMaterial
      this.queryParam.partMaterial = data.partMaterial
      this.queryParam.paintcoatFlag = data.paintcoatFlag
      this.queryParam.toolPattern = data.toolPattern
      this.queryParam.clampingSpecifications = data.clampingSpecifications
      this.queryParam.coolingMethod = data.coolingMethod
      this.queryParam.numberOfTeeth = data.numberOfTeeth
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'clampingSpecifications',
        'sizeSpecifications',
        'adaptBlade',
        'noseAngleR',
        'noseAngleC',
        'angleInsideR',
        'numberOfTeeth',
        'smallDiameter',
        'toolAngle',
        'mainAngleK',
        'deepestDepth',
        'pitch',
        'recentlyDiameter',
        'accuracyClass',
        'toolMaterial',
        'coolingMethod',
        'paintcoatFlag',
        'toolPattern',
        'handleForm',
        'handleNeckForm',
        'numberPatterns',
        'millingHeadForm',
        'cuttingEdgeForm',
        'littleDiameter',
        'bigDiameter',
        'smallEdgeLength',
        'bigEdgeLength',
        'smallTotalLength',
        'bigTotalLength',
        'smallNeckDiameter',
        'bigNeckDiameter',
        'smallHandleLength',
        'bigHandleLength',
        'smallHandleNeckLength',
        'bigHandleNeckLength',
        'smallOverhangingLength',
        'bigOverhangingLength'
      ]
      fields.forEach((field) => {
        this.queryParam[field] = data[field]
      })
      this.loadData()
    },
    paraTurningToolsOk(data) {
      this.queryParam.chineseName = data.chineseName
      this.queryParam.foreignLanguageName = data.foreignLanguageName
      this.queryParam.standardLevel = data.standardLevel
      this.queryParam.standardCode = data.standardCode
      this.queryParam.headSpecifications = data.headSpecifications
      this.queryParam.matchingNumber = data.matchingNumber
      this.queryParam.leadAngle = data.leadAngle
      this.queryParam.totalLength = data.totalLength
      this.queryParam.toolMaterial = data.toolMaterial
      this.queryParam.partMaterial = data.partMaterial
      this.queryParam.paintcoatFlag = data.paintcoatFlag
      this.queryParam.toolPattern = data.toolPattern
      this.queryParam.crossSectionalSize = data.crossSectionalSize
      this.queryParam.coolingMethod = data.coolingMethod
      this.queryParam.cuttingDirection = data.cuttingDirection
      this.queryParam.technicalConditions = data.technicalConditions
      this.queryParam.conditionsInfo = data.conditionsInfo
      this.queryParam.toolModel = data.toolModel
      this.queryParam.shortCalled = data.shortCalled
      this.queryParam.groupCompanyCode = data.groupCompanyCode
     const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'paintcoatFlag',
        'headSpecifications',
        'matchingNumber',
        'knifeClipModel',
        'leadAngle',
        'crossSectionalSize',
        'knifeSize',
        'bladePosterior',
        'accuracyClass',
        'cuttingDirection',
        'toolMaterial',
        'toolPattern',
        'types',
        'coolingMethod',
        'fasteningForm',
        'holderCategory',
        'bladeShape',
        'clampingMethod',
        'barDirection',
        'smallTotalLength',
        'bigTotalLength',
        'smallBoringBarDiameter',
        'bigBoringBarDiameter',
        'smallBladeLength',
        'bigBladeLength',
        'smallToolDiameter',
        'bigToolDiameter',
        'smallBladeHeight',
        'bigBladeHeight',
        'smallBladeWide',
        'bigBladeWide',
        'smallBladeSize',
        'bigBladeSize',
        'smallSlotWidth',
        'bigSlotWidth',
        'smallSmallDiameter',
        'bigSmallDiameter',
        'smallMaxDiameter',
        'bigMaxDiameter',
        'smallMaxDepth',
        'bigMaxDepth',
        'smallMinDiameter',
        'bigMinDiameter',
        'smallBladeThickness',
        'bigBladeThickness'
      ]
      fields.forEach((field) => {
        this.queryParam[field] = data[field]
      })
      this.loadData()
    },
  },

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

@@ -671,6 +671,12 @@
    edit(record) {
      this.editable = true
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.bladeShapeChange1 = '-'+record.bladeShape
      this.bladeLengthChange1 = '-'+record.bladeLength
      this.cuttingEdgeCountChange1 = '-'+record.cuttingEdgeCount
      this.noseAngleRChange1 = '-'+record.noseAngleR
      //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,

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

@@ -1,7 +1,7 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :width="1200"
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
@@ -12,185 +12,263 @@
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model"  :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="chineseName" label="中文名称">
              <a-input
                :placeholder="'请输入中文名称'"
                v-model="model.chineseName"
              />
              <a-input :placeholder="'请输入中文名称'" v-model="model.chineseName" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="foreignLanguageName" label="外文名称">
              <a-input
                :placeholder="'请输入外文名称'"
                v-model="model.foreignLanguageName"
              />
              <a-input :placeholder="'请输入外文名称'" v-model="model.foreignLanguageName" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
              <a-input :placeholder="'请输入工具简称'" v-model="model.shortCalled" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
              <a-input :placeholder="'请输入集团公司编码'" v-model="model.groupCompanyCode" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanySign" label="标记">
              <a-input :placeholder="'请输入标记'" v-model="model.groupCompanySign" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
                v-model="model.standardLevel"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input
                :placeholder="'请输入标准号'"
                v-model="model.standardCode"
              />
              <a-input :placeholder="'请输入标准级别'" v-model="model.standardLevel" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input :placeholder="'请输入标准号'" v-model="model.standardCode" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="toolModel" label="型号/图号">
              <a-input
                :placeholder="'请输入型号/图号'"
                v-model="model.toolModel"
              />
              <a-input :placeholder="'请输入型号/图号'" v-model="model.toolModel" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刀片形状" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
              <a-input
                v-model="model.bladeShape"
                :placeholder="'请输入刀片形状'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀片长度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeLength">
              <a-input
                v-model="model.bladeLength"
                :placeholder="'请输入刀片长度'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="切削刃数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeCount">
              <a-input
                v-model="model.cuttingEdgeCount"
                :placeholder="'请输入切削刃数'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀片厚度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeThickness">
              <a-input
                v-model="model.bladeThickness"
                :placeholder="'请输入刀片厚度'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input
                v-model="model.toolMaterial"
                :placeholder="'请输入刀具材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input
                v-model="model.partMaterial"
                :placeholder="'请输入零件材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group
                v-model="model.paintcoatFlag"
                :placeholder="'请选择是否涂层'"
              >
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
              <a-input v-model="model.partMaterial" :placeholder="'请输入零件材料'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="夹固型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
              <a-input
                v-model="model.clampingType"
                :placeholder="'请输入夹固型式'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item
              label="刀尖R"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="noseAngleR"
            >
              <a-input
                v-model="model.noseAngleR"
                :placeholder="'请输入刀尖R'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="technicalConditions"
            >
              <a-input
                v-model="model.technicalConditions"
                :placeholder="'请输入附加技术条件'"
              ></a-input>
              <a-input v-model="model.technicalConditions" :placeholder="'请输入附加技术条件'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="conditionsInfo"
            >
              <a-input
                v-model="model.conditionsInfo"
                :placeholder="'请输入附加技术条件说明'"
              ></a-input>
              <a-input v-model="model.conditionsInfo" :placeholder="'请输入附加技术条件说明'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
              <a-input v-model="model.brand" :placeholder="'请输入品牌'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="涂层材质" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coatingMaterial">
              <a-input v-model="model.coatingMaterial" :placeholder="'请输入涂层材质'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="加工分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingClassify">
              <a-input v-model="model.processingClassify" :placeholder="'请输入加工分类'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀片后角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladePosterior">
              <a-input v-model="model.bladePosterior" :placeholder="'请输入刀片后角'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀片尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeSize">
              <a-input v-model="model.bladeSize" :placeholder="'请输入刀片尺寸'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="切削刃数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeCount">
              <a-input v-model="model.cuttingEdgeCount" :placeholder="'请输入切削刃数'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀尖R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
              <a-input v-model="model.noseAngleR" :placeholder="'请输入刀尖R'"></a-input>
            </a-form-model-item>
          </a-col>
          
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="牙型角度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="dentalAngle">
              <a-input v-model="model.dentalAngle" :placeholder="'请输入牙型角度'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
              <a-input v-model="model.pitch" :placeholder="'请输入螺距'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="精度等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                placeholder="请选择精度等级"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀片形状" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
              <j-dict-select-tag
                type="list"
                v-model="model.bladeShape"
                :triggerChange="true"
                dictCode="blade_shape"
                placeholder="请选择刀片形状"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="夹固型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingType">
              <j-dict-select-tag
                type="list"
                v-model="model.clampingType"
                :triggerChange="true"
                dictCode="clamping_type"
                placeholder="请选择夹固型式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀片材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀片材料"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
         <a-col :span="8">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="'请选择是否涂层'">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="切削方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
              <j-dict-select-tag
                type="list"
                v-model="model.cuttingDirection"
                :triggerChange="true"
                dictCode="cutting_direction"
                placeholder="请选择切削方向"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="内外螺纹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="inOutThread">
              <j-dict-select-tag
                type="list"
                v-model="model.inOutThread"
                :triggerChange="true"
                dictCode="in_out_thread"
                placeholder="请选择内外螺纹"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺纹标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
              <j-dict-select-tag
                type="list"
                v-model="model.threadStandard"
                :triggerChange="true"
                dictCode="thread_standard"
                placeholder="请选择螺纹标准"
              />
            </a-form-model-item>
          </a-col>
         <a-col :span="8">
            <a-form-item label="刀片长度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeLength"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeLength"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
         <a-col :span="8">
            <a-form-item label="刀片厚度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeThickness"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeThickness"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="刀片宽度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeWide"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeWide"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="最小加工内螺纹公称直径">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallMinInternalThread"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigMinInternalThread"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        
      </a-form-model>
    </a-spin>
    <template slot="footer">
@@ -240,24 +318,48 @@
    },
     
    searchQuery(){
      this.searchParams.chineseName = this.model.chineseName
      this.searchParams.foreignLanguageName = this.model.foreignLanguageName
      this.searchParams.standardLevel = this.model.standardLevel
      this.searchParams.standardCode = this.model.standardCode
      this.searchParams.bladeShape = this.model.bladeShape
      this.searchParams.bladeLength = this.model.bladeLength
      this.searchParams.cuttingEdgeCount = this.model.cuttingEdgeCount
      this.searchParams.bladeThickness = this.model.bladeThickness
      this.searchParams.toolMaterial = this.model.toolMaterial
      this.searchParams.partMaterial = this.model.partMaterial
      this.searchParams.paintcoatFlag = this.model.paintcoatFlag
      this.searchParams.clampingType = this.model.clampingType
      this.searchParams.noseAngleR = this.model.noseAngleR
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'coatingMaterial',
        'processingClassify',
        'bladePosterior',
        'bladeSize',
        'cuttingEdgeCount',
        'noseAngleR',
        'dentalAngle',
        'pitch',
        'accuracyClass',
        'bladeShape',
        'clampingType',
        'toolMaterial',
        'paintcoatFlag',
        'types',
        'cuttingDirection',
        'inOutThread',
        'threadStandard',
        'smallBladeLength',
        'bigBladeLength',
        'smallBladeThickness',
        'bigBladeThickness',
        'smallBladeWide',
        'bigBladeWide',
        'smallMinInternalThread',
        'bigMinInternalThread'
      ]
      fields.forEach((field) => {
        this.searchParams[field] = this.model[field]
      })
      this.close()
      this.$emit('searchParams',this.searchParams)
    },

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

@@ -566,6 +566,10 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.diameterChange1 = '-'+record.diameter
      this.totalLengthChange1 = '-'+record.totalLength
      //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,

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

@@ -1,7 +1,7 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :width="1200"
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
@@ -10,205 +10,363 @@
    cancelText="关闭"
  >
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model"  :labelCol="labelCol" :wrapperCol="wrapperCol">
      <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="chineseName" label="中文名称">
              <a-input
                :placeholder="'请输入中文名称'"
                v-model="model.chineseName"
              />
              <a-input :placeholder="'请输入中文名称'" v-model="model.chineseName" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="foreignLanguageName" label="外文名称">
              <a-input
                :placeholder="'请输入外文名称'"
                v-model="model.foreignLanguageName"
              />
              <a-input :placeholder="'请输入外文名称'" v-model="model.foreignLanguageName" />
            </a-form-model-item>
          </a-col>
        </a-row>
         <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
              <a-input :placeholder="'请输入工具简称'" v-model="model.shortCalled" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
              <a-input :placeholder="'请输入集团公司编码'" v-model="model.groupCompanyCode" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanySign" label="标记">
              <a-input :placeholder="'请输入标记'" v-model="model.groupCompanySign" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
                v-model="model.standardLevel"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input
                :placeholder="'请输入标准号'"
                v-model="model.standardCode"
              />
              <a-input :placeholder="'请输入标准级别'" v-model="model.standardLevel" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input :placeholder="'请输入标准号'" v-model="model.standardCode" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="toolModel" label="型号/图号">
              <a-input
                :placeholder="'请输入型号/图号'"
                v-model="model.toolModel"
              />
              <a-input :placeholder="'请输入型号/图号'" v-model="model.toolModel" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
              <a-input
                v-model="model.diameter"
                :placeholder="'请输入直径'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="切削刃锥角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coneAngle">
              <a-input
                v-model="model.coneAngle"
                :placeholder="'请输入切削刃锥角'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="切削刃长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
              <a-input
                v-model="model.edgeLength"
                :placeholder="'请输入切削刃长'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具总长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
              <a-input
                v-model="model.totalLength"
                :placeholder="'请输入刀具总长'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input
                v-model="model.toolMaterial"
                :placeholder="'请输入刀具材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input
                v-model="model.partMaterial"
                :placeholder="'请输入零件材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group
                v-model="model.paintcoatFlag"
                :placeholder="'请选择是否涂层'"
              >
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
              <a-input v-model="model.partMaterial" :placeholder="'请输入零件材料'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <a-input
                v-model="model.toolPattern"
                :placeholder="'请输入刀具型式'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item
              label="柄部规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="handleSpecifications"
            >
              <a-input
                v-model="model.handleSpecifications"
                :placeholder="'请输入柄部规格'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <a-input
                v-model="model.coolingMethod"
                :placeholder="'请输入冷却方式'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刃数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeCount">
              <a-input
                v-model="model.bladeCount"
                :placeholder="'请输入刃数'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="technicalConditions"
            >
              <a-input
                v-model="model.technicalConditions"
                :placeholder="'请输入附加技术条件'"
              ></a-input>
              <a-input v-model="model.technicalConditions" :placeholder="'请输入附加技术条件'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="conditionsInfo"
            >
              <a-input
                v-model="model.conditionsInfo"
                :placeholder="'请输入附加技术条件说明'"
              ></a-input>
              <a-input v-model="model.conditionsInfo" :placeholder="'请输入附加技术条件说明'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
              <a-input v-model="model.brand" :placeholder="'请输入品牌'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item
              label="柄部规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="handleSpecifications"
            >
              <a-input v-model="model.handleSpecifications" :placeholder="'请输入柄部规格'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="公差等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toleranceClass">
              <a-input v-model="model.toleranceClass" :placeholder="'请输入公差等级'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item
              label="适配刀片-刀头-刀杆"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="fitterPart"
            >
              <a-input v-model="model.fitterPart" :placeholder="'请输入适配刀片-刀头-刀杆'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="接口形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectorType">
              <a-input v-model="model.connectorType" :placeholder="'请输入接口形式'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="切削刃锥角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coneAngle">
              <a-input v-model="model.coneAngle" :placeholder="'请输入切削刃锥角'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刃数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeCount">
              <a-input v-model="model.bladeCount" :placeholder="'请输入刃数'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="最小直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="smallDiameter">
              <a-input v-model="model.smallDiameter" :placeholder="'请输入最小直径'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="倒角角度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="chamferAngle">
              <a-input v-model="model.chamferAngle" :placeholder="'请输入倒角角度'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item
              label="有效加工长度"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="effectiveLength"
            >
              <a-input v-model="model.effectiveLength" :placeholder="'请输入有效加工长度'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item
              label="钻头直径范围"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="drillDiameterRange"
            >
              <a-input v-model="model.drillDiameterRange" :placeholder="'请输入钻头直径范围 '"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀杆直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="knifeDiameter">
              <a-input v-model="model.knifeDiameter" :placeholder="'请输入刀杆直径'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="孔径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="boreDiameter">
              <a-input v-model="model.boreDiameter" :placeholder="'请输入孔径'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item
              label="接口槽长规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="slotSpecification"
            >
              <a-input v-model="model.slotSpecification" :placeholder="'请输入接口槽长规格'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀头数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headsNumber">
              <a-input v-model="model.headsNumber" :placeholder="'请输入刀头数'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="适配刀座" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="adaptHolder">
              <a-input v-model="model.adaptHolder" :placeholder="'请输入适配刀座'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="导向长度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guidanceLength">
              <a-input v-model="model.guidanceLength" :placeholder="'请输入导向长度'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="导向直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guidanceDiameter">
              <a-input v-model="model.guidanceDiameter" :placeholder="'请输入导向直径'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="精度等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                placeholder="请选择精度等级"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="'请选择是否涂层'">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <j-dict-select-tag
                type="list"
                v-model="model.toolPattern"
                :triggerChange="true"
                dictCode="tool_pattern"
                placeholder="请选择刀具型式"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="8">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="排屑槽形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteForm">
              <j-dict-select-tag
                type="list"
                v-model="model.fluteForm"
                :triggerChange="true"
                dictCode="flute_form"
                placeholder="请选择排屑槽形式"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="柄部形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
              <j-dict-select-tag
                type="list"
                v-model="model.handleForm"
                :triggerChange="true"
                dictCode="handle_form"
                placeholder="请选择柄部形式"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="8">
            <a-form-model-item label="适用范围" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="scopeOfApplication">
              <j-dict-select-tag
                type="list"
                v-model="model.scopeOfApplication"
                :triggerChange="true"
                dictCode="scope_of_application"
                placeholder="请选择适用范围"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="加工方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="processingmethod">
              <j-dict-select-tag
                type="list"
                v-model="model.processingmethod"
                :triggerChange="true"
                dictCode="processingmethod"
                placeholder="请选择加工方式"
              />
            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="8">
              <a-form-item label="直径">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.littleDiameter"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigDiameter"></a-input>
              </a-form-item>
          </a-col>
          <a-col :span="8">
              <a-form-item label="切削刃长">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
              </a-form-item>
          </a-col>
    <a-col :span="8">
              <a-form-item label="刀具总长">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
              </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
              <a-form-item label="最小镗孔直径">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallLatestBoringDiameter"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigLatestBoringDiameter"></a-input>
              </a-form-item>
          </a-col>
          <a-col :span="8">
              <a-form-item label="最大镗孔直径">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallMaxBoringDiameter"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigMaxBoringDiameter"></a-input>
              </a-form-item>
          </a-col>
        </a-row>
      
      </a-form-model>
    </a-spin>
    <template slot="footer">
@@ -220,9 +378,13 @@
</template>

<script>
import JDictSelectTag from '@/components/dict/JDictSelectTag'

export default {
  name: 'ParaHoleToolsSearchModal',
  components: {
    JDictSelectTag,
  },
  data() {
    return {
      title: '工具信息-高级查询',
@@ -237,14 +399,11 @@
        xs: { span: 24 },
        sm: { span: 14 },
      },
      searchParams:{}
      searchParams: {},
    }
  },
  created() {
  },
  mounted() {
    
  },
  created() {},
  mounted() {},
  methods: {
    show() {
      this.visible = true
@@ -256,34 +415,91 @@
    handleCancel() {
      this.close()
    },
     
    searchQuery(){
      this.searchParams.chineseName = this.model.chineseName
      this.searchParams.foreignLanguageName = this.model.foreignLanguageName
      this.searchParams.standardLevel = this.model.standardLevel
      this.searchParams.standardCode = this.model.standardCode
      this.searchParams.diameter = this.model.diameter
      this.searchParams.coneAngle = this.model.coneAngle
      this.searchParams.edgeLength = this.model.edgeLength
      this.searchParams.totalLength = this.model.totalLength
      this.searchParams.toolMaterial = this.model.toolMaterial
      this.searchParams.partMaterial = this.model.partMaterial
      this.searchParams.paintcoatFlag = this.model.paintcoatFlag
      this.searchParams.toolPattern = this.model.toolPattern
      this.searchParams.handleSpecifications = this.model.handleSpecifications
      this.searchParams.coolingMethod = this.model.coolingMethod
      this.searchParams.bladeCount = this.model.bladeCount
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode

    searchQuery() {
      const fields = [
    'chineseName',
    'foreignLanguageName',
    'standardLevel',
    'standardCode',
    'coneAngle',
    'edgeLength',
    'totalLength',
    'toolMaterial',
    'partMaterial',
    'paintcoatFlag',
    'toolPattern',
    'handleSpecifications',
    'coolingMethod',
    'bladeCount',
    'technicalConditions',
    'conditionsInfo',
    'toolModel',
    'shortCalled',
    'groupCompanyCode',
    'groupCompanySign',
    'brand',
    'toleranceClass',
    'fitterPart',
    'connectorType',
    'smallDiameter',
    'chamferAngle',
    'effectiveLength',
    'drillDiameterRange',
    'knifeDiameter',
    'boreDiameter',
    'slotSpecification',
    'headsNumber',
    'adaptHolder',
    'guidanceLength',
    'guidanceDiameter',
    'accuracyClass',
    'types',
    'fluteForm',
    'handleForm',
    'scopeOfApplication',
    'processingmethod',
    'littleDiameter',
    'bigDiameter',
    'smallEdgeLength',
    'bigEdgeLength',
    'smallTotalLength',
    'bigTotalLength',
    'smallLatestBoringDiameter',
    'bigLatestBoringDiameter',
    'smallMaxBoringDiameter',
    'bigMaxBoringDiameter'
  ];

  fields.forEach(field => {
    this.searchParams[field] = this.model[field];
  });
      // this.searchParams.chineseName = this.model.chineseName
      // this.searchParams.foreignLanguageName = this.model.foreignLanguageName
      // this.searchParams.standardLevel = this.model.standardLevel
      // this.searchParams.standardCode = this.model.standardCode
      // this.searchParams.diameter = this.model.diameter
      // this.searchParams.coneAngle = this.model.coneAngle
      // this.searchParams.edgeLength = this.model.edgeLength
      // this.searchParams.totalLength = this.model.totalLength
      // this.searchParams.toolMaterial = this.model.toolMaterial
      // this.searchParams.partMaterial = this.model.partMaterial
      // this.searchParams.paintcoatFlag = this.model.paintcoatFlag
      // this.searchParams.toolPattern = this.model.toolPattern
      // this.searchParams.handleSpecifications = this.model.handleSpecifications
      // this.searchParams.coolingMethod = this.model.coolingMethod
      // this.searchParams.bladeCount = this.model.bladeCount
      // this.searchParams.technicalConditions = this.model.technicalConditions
      // this.searchParams.conditionsInfo = this.model.conditionsInfo
      // this.searchParams.toolModel = this.model.toolModel
      // this.searchParams.shortCalled = this.model.shortCalled
      // this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      this.close()
      this.$emit('searchParams',this.searchParams)
      this.$emit('searchParams', this.searchParams)
    },
    searchReset(){
    searchReset() {
      this.model = {}
    }
    },
  },
}
</script>

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

@@ -570,6 +570,11 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.diameterChange1 = '-'+record.diameter
      this.totalLengthChange1 = '-'+record.totalLength
      this.noseAngleRChange1 = '-' + record.noseAngleR
      //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,

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

@@ -1,7 +1,7 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :width="1200"
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
@@ -12,144 +12,85 @@
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model"  :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="chineseName" label="中文名称">
              <a-input
                :placeholder="'请输入中文名称'"
                v-model="model.chineseName"
              />
              <a-input :placeholder="'请输入中文名称'" v-model="model.chineseName" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="foreignLanguageName" label="外文名称">
              <a-input
                :placeholder="'请输入外文名称'"
                v-model="model.foreignLanguageName"
              />
              <a-input :placeholder="'请输入外文名称'" v-model="model.foreignLanguageName" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
              <a-input :placeholder="'请输入工具简称'" v-model="model.shortCalled" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
              <a-input :placeholder="'请输入集团公司编码'" v-model="model.groupCompanyCode" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanySign" label="标记">
              <a-input :placeholder="'请输入标记'" v-model="model.groupCompanySign" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
                v-model="model.standardLevel"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input
                :placeholder="'请输入标准号'"
                v-model="model.standardCode"
              />
              <a-input :placeholder="'请输入标准级别'" v-model="model.standardLevel" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input :placeholder="'请输入标准号'" v-model="model.standardCode" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="toolModel" label="型号/图号">
              <a-input
                :placeholder="'请输入型号/图号'"
                v-model="model.toolModel"
              />
              <a-input :placeholder="'请输入型号/图号'" v-model="model.toolModel" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="diameter">
              <a-input
                v-model="model.diameter"
                :placeholder="'请输入直径'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="齿数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberOfTeeth">
              <a-input
                v-model="model.numberOfTeeth"
                :placeholder="'请输入齿数'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="切削刃长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
              <a-input
                v-model="model.edgeLength"
                :placeholder="'请输入切削刃长'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具总长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
              <a-input
                v-model="model.totalLength"
                :placeholder="'请输入刀具总长'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input
                v-model="model.toolMaterial"
                :placeholder="'请输入刀具材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input
                v-model="model.partMaterial"
                :placeholder="'请输入零件材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group
                v-model="model.paintcoatFlag"
                :placeholder="'请选择是否涂层'"
              >
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
              <a-input v-model="model.partMaterial" :placeholder="'请输入零件材料'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <a-input
                v-model="model.toolPattern"
                :placeholder="'请输入刀具型式'"
              ></a-input>
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="technicalConditions"
            >
              <a-input v-model="model.technicalConditions" :placeholder="'请输入附加技术条件'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="conditionsInfo"
            >
              <a-input v-model="model.conditionsInfo" :placeholder="'请输入附加技术条件说明'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
              <a-input v-model="model.brand" :placeholder="'请输入品牌'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item
              label="装夹规格"
              :labelCol="labelCol"
@@ -162,17 +103,35 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
          <a-col :span="8">
            <a-form-model-item
              label="接口尺寸规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="sizeSpecifications"
            >
              <a-input
                v-model="model.coolingMethod"
                :placeholder="'请输入冷却方式'"
                v-model="model.sizeSpecifications"
                :placeholder="'请输入接口尺寸规格'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="适配刀片"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="adaptBlade"
            >
              <a-input
                v-model="model.adaptBlade"
                :placeholder="'请输入适配刀片'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀尖角R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleR">
              <a-input
                v-model="model.noseAngleR"
@@ -180,33 +139,247 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="technicalConditions"
            >
          <a-col :span="8">
            <a-form-model-item label="刀尖角C" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="noseAngleC">
              <a-input
                v-model="model.technicalConditions"
                :placeholder="'请输入附加技术条件'"
                v-model="model.noseAngleC"
                :placeholder="'请输入刀尖角C'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="conditionsInfo"
            >
          <a-col :span="8">
            <a-form-model-item label="刀尖角内R" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="angleInsideR">
              <a-input
                v-model="model.conditionsInfo"
                :placeholder="'请输入附加技术条件说明'"
                v-model="model.angleInsideR"
                :placeholder="'请输入刀尖角内R'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="齿数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberOfTeeth">
              <a-input
                v-model="model.numberOfTeeth"
                :placeholder="'请输入齿数'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="最小直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="smallDiameter">
              <a-input
                v-model="model.smallDiameter"
                :placeholder="'请输入最小直径'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀具角度" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolAngle">
              <a-input
                v-model="model.toolAngle"
                :placeholder="'请输入刀具角度'"
              ></a-input>
            </a-form-model-item>
          </a-col>         
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="主偏角K" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="mainAngleK">
              <a-input
                v-model="model.mainAngleK"
                :placeholder="'请输入主偏角K'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="最大切深" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deepestDepth">
              <a-input
                v-model="model.deepestDepth"
                :placeholder="'请输入最大切深'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
              <a-input
                v-model="model.pitch"
                :placeholder="'请输入螺距'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="最小加工直径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="recentlyDiameter">
              <a-input
                v-model="model.recentlyDiameter"
                :placeholder="'请输入最小加工直径'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="精度等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                placeholder="请选择精度等级"
              />
            </a-form-model-item>
          </a-col>
           <a-col :span="8">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
              />
            </a-form-model-item>
          </a-col>
        </a-row>   
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="'请选择是否涂层'">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <j-dict-select-tag
                type="list"
                v-model="model.toolPattern"
                :triggerChange="true"
                dictCode="tool_pattern"
                placeholder="请选择刀具型式"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
<a-col :span="8">
            <a-form-model-item label="柄部形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleForm">
              <j-dict-select-tag
                type="list"
                v-model="model.handleForm"
                :triggerChange="true"
                dictCode="handle_form"
                placeholder="请选择柄部形式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="柄颈形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="handleNeckForm">
              <j-dict-select-tag
                type="list"
                v-model="model.handleNeckForm"
                :triggerChange="true"
                dictCode="handle_neck_form"
                placeholder="请选择柄颈形式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="内外螺纹" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="numberPatterns">
              <j-dict-select-tag
                type="list"
                v-model="model.numberPatterns"
                :triggerChange="true"
                dictCode="number_patterns"
                placeholder="请选择内外螺纹"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
<a-col :span="8">
            <a-form-model-item label="铣刀头形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="millingHeadForm">
              <j-dict-select-tag
                type="list"
                v-model="model.millingHeadForm"
                :triggerChange="true"
                dictCode="milling_head_form"
                placeholder="请选择铣刀头形式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="切削刃形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingEdgeForm">
              <j-dict-select-tag
                type="list"
                v-model="model.cuttingEdgeForm"
                :triggerChange="true"
                dictCode="cutting_edge_form"
                placeholder="请选择切削刃形式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
              <a-form-item label="刀具直径">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.littleDiameter"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigDiameter"></a-input>
              </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
              <a-form-item label="切削刃长">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
              </a-form-item>
          </a-col>
    <a-col :span="8">
              <a-form-item label="刀具总长">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
              </a-form-item>
          </a-col><a-col :span="8">
              <a-form-item label="颈径">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallNeckDiameter"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigNeckDiameter"></a-input>
              </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
              <a-form-item label="柄长">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallHandleLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigHandleLength"></a-input>
              </a-form-item>
          </a-col>
    <a-col :span="8">
              <a-form-item label="柄颈长度">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallHandleNeckLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigHandleNeckLength"></a-input>
              </a-form-item>
          </a-col><a-col :span="8">
              <a-form-item label="悬伸长度">
                <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallOverhangingLength"></a-input>
                <span class="query-group-split-cust"></span>
                <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigOverhangingLength"></a-input>
              </a-form-item>
          </a-col>
        </a-row>
      </a-form-model>
@@ -258,26 +431,60 @@
    },
     
    searchQuery(){
      this.searchParams.chineseName = this.model.chineseName
      this.searchParams.foreignLanguageName = this.model.foreignLanguageName
      this.searchParams.standardLevel = this.model.standardLevel
      this.searchParams.standardCode = this.model.standardCode
      this.searchParams.diameter = this.model.diameter
      this.searchParams.noseAngleR = this.model.noseAngleR
      this.searchParams.edgeLength = this.model.edgeLength
      this.searchParams.totalLength = this.model.totalLength
      this.searchParams.toolMaterial = this.model.toolMaterial
      this.searchParams.partMaterial = this.model.partMaterial
      this.searchParams.paintcoatFlag = this.model.paintcoatFlag
      this.searchParams.toolPattern = this.model.toolPattern
      this.searchParams.clampingSpecifications = this.model.clampingSpecifications
      this.searchParams.coolingMethod = this.model.coolingMethod
      this.searchParams.numberOfTeeth = this.model.numberOfTeeth
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'clampingSpecifications',
        'sizeSpecifications',
        'adaptBlade',
        'noseAngleR',
        'noseAngleC',
        'angleInsideR',
        'numberOfTeeth',
        'smallDiameter',
        'toolAngle',
        'mainAngleK',
        'deepestDepth',
        'pitch',
        'recentlyDiameter',
        'accuracyClass',
        'toolMaterial',
        'coolingMethod',
        'paintcoatFlag',
        'toolPattern',
        'handleForm',
        'handleNeckForm',
        'numberPatterns',
        'millingHeadForm',
        'cuttingEdgeForm',
        'littleDiameter',
        'bigDiameter',
        'smallEdgeLength',
        'bigEdgeLength',
        'smallTotalLength',
        'bigTotalLength',
        'smallNeckDiameter',
        'bigNeckDiameter',
        'smallHandleLength',
        'bigHandleLength',
        'smallHandleNeckLength',
        'bigHandleNeckLength',
        'smallOverhangingLength',
        'bigOverhangingLength'
      ]
      fields.forEach((field) => {
        this.searchParams[field] = this.model[field]
      })
      this.close()
      this.$emit('searchParams',this.searchParams)
    },

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

@@ -505,6 +505,10 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.threadCodeChange1 = '-'+record.threadCode
      this.pitchChange1 = '-'+record.pitch
       //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,

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

@@ -1,7 +1,7 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :width="1200"
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
@@ -12,134 +12,58 @@
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model" :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="chineseName" label="中文名称">
              <a-input :placeholder="'请输入中文名称'" v-model="model.chineseName" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="foreignLanguageName" label="外文名称">
              <a-input :placeholder="'请输入外文名称'" v-model="model.foreignLanguageName" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
              <a-input :placeholder="'请输入工具简称'" v-model="model.shortCalled" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input :placeholder="'请输入集团公司编码'" v-model="model.groupCompanyCode" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="groupCompanySign" label="标记">
              <a-input :placeholder="'请输入标记'" v-model="model.groupCompanySign" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input :placeholder="'请输入标准级别'" v-model="model.standardLevel" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input :placeholder="'请输入标准号'" v-model="model.standardCode" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="toolModel" label="型号/图号">
              <a-input :placeholder="'请输入型号/图号'" v-model="model.toolModel" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="螺纹代号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
              <a-input v-model="model.threadCode" :placeholder="'请输入螺纹代号'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="螺距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
              <a-input v-model="model.pitch" :placeholder="'请输入螺距'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="螺纹旋向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
              <a-input v-model="model.rotationDirection" :placeholder="'请输入螺纹旋向'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item
              label="螺纹公差带代号/精度等级"
              :labelCol="{span:12}"
              :wrapperCol="{span:10}"
              prop="tolerancezoneLevel"
            >
              <a-input v-model="model.tolerancezoneLevel" :placeholder="'请输入螺纹公差带代号/精度等级'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="切削刃长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="edgeLength">
              <a-input v-model="model.edgeLength" :placeholder="'请输入切削刃长'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具总长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
              <a-input v-model="model.totalLength" :placeholder="'请输入刀具总长'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="'请选择是否涂层'">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
              <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
                <a-input v-model="model.toolMaterial" :placeholder="'请输入刀具材料'"></a-input>
              </a-form-model-item>
            </a-col>
            <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input v-model="model.partMaterial" :placeholder="'请输入零件材料'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="外型尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="externalDimensions">
              <a-input v-model="model.externalDimensions" :placeholder="'请输入外型尺寸'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item
              label="柄部规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="handleSpecifications"
            >
              <a-input v-model="model.handleSpecifications" :placeholder="'请输入柄部规格'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
@@ -149,7 +73,7 @@
              <a-input v-model="model.technicalConditions" :placeholder="'请输入附加技术条件'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
@@ -158,6 +82,196 @@
            >
              <a-input v-model="model.conditionsInfo" :placeholder="'请输入附加技术条件说明'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
              <a-input v-model="model.brand" :placeholder="'请输入品牌'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item label="螺纹代号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadCode">
              <a-input v-model="model.threadCode" :placeholder="'请输入螺纹代号'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item
              label="螺纹公差带代号/精度等级"
              :labelCol="{ span: 12 }"
              :wrapperCol="{ span: 10 }"
              prop="tolerancezoneLevel"
            >
              <a-input v-model="model.tolerancezoneLevel" :placeholder="'请输入螺纹公差带代号/精度等级'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺距" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pitch">
              <a-input v-model="model.pitch" :placeholder="'请输入螺距'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item
              label="柄部规格"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="handleSpecifications"
            >
              <a-input v-model="model.handleSpecifications" :placeholder="'请输入柄部规格'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="导向尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="guidingSize">
              <a-input v-model="model.guidingSize" :placeholder="'请输入导向尺寸'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="连接孔径" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectionAperture">
              <a-input v-model="model.connectionAperture" :placeholder="'请输入连接孔径'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="连接键槽" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="connectingKeyway">
              <a-input v-model="model.connectingKeyway" :placeholder="'请输入连接键槽'"></a-input>
            </a-form-model-item>
          </a-col>

          <a-col :span="8">
            <a-form-model-item label="精度等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                placeholder="请选择精度等级"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺纹旋向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="rotationDirection">
              <j-dict-select-tag
                type="list"
                v-model="model.rotationDirection"
                :triggerChange="true"
                dictCode="rotation_direction"
                placeholder="请选择螺纹旋向"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="'请选择是否涂层'">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺孔类型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="screwHoleType">
              <j-dict-select-tag
                type="list"
                v-model="model.screwHoleType"
                :triggerChange="true"
                dictCode="screw_hole_type"
                placeholder="请选择螺孔类型"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="螺纹标准" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="threadStandard">
              <j-dict-select-tag
                type="list"
                v-model="model.threadStandard"
                :triggerChange="true"
                dictCode="thread_standard"
                placeholder="请选择螺纹标准"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="排屑槽型" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fluteSoltType">
              <j-dict-select-tag
                type="list"
                v-model="model.fluteSoltType"
                :triggerChange="true"
                dictCode="flute_solt_type"
                placeholder="请选择排屑槽型"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="外型尺寸">
              <a-input
                placeholder="请输入最小值"
                class="query-group-cust"
                v-model="model.smallExternalDimensions"
              ></a-input>
              <span class="query-group-split-cust"></span>
              <a-input
                placeholder="请输入最大值"
                class="query-group-cust"
                v-model="model.bigExternalDimensions"
              ></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="切削刃长">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallEdgeLength"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigEdgeLength"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="刀具总长">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form-model>
@@ -205,24 +319,47 @@
    },

    searchQuery() {
      this.searchParams.chineseName = this.model.chineseName
      this.searchParams.foreignLanguageName = this.model.foreignLanguageName
      this.searchParams.threadCode = this.model.threadCode
      this.searchParams.pitch = this.model.pitch
      this.searchParams.rotationDirection = this.model.rotationDirection
      this.searchParams.tolerancezoneLevel = this.model.tolerancezoneLevel
      this.searchParams.edgeLength = this.model.edgeLength
      this.searchParams.totalLength = this.model.totalLength
      this.searchParams.toolMaterial = this.model.toolMaterial
      this.searchParams.partMaterial = this.model.partMaterial
      this.searchParams.paintcoatFlag = this.model.paintcoatFlag
      this.searchParams.externalDimensions = this.model.externalDimensions
      this.searchParams.handleSpecifications = this.model.handleSpecifications
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'threadCode',
        'tolerancezoneLevel',
        'pitch',
        'handleSpecifications',
        'guidingSize',
        'connectionAperture',
        'connectingKeyway',
        'accuracyClass',
        'rotationDirection',
        'paintcoatFlag',
        'toolMaterial',
        'coolingMethod',
        'types',
        'screwHoleType',
        'threadStandard',
        'fluteSoltType',
        'smallExternalDimensions',
        'bigExternalDimensions',
        'smallEdgeLength',
        'bigEdgeLength',
        'smallTotalLength',
        'bigTotalLength'
      ]

      fields.forEach((field) => {
        this.searchParams[field] = this.model[field]
      })

      this.close()
      this.$emit('searchParams', this.searchParams)
    },

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

@@ -582,6 +582,10 @@
    edit(record) {
      this.editable = true;
      this.model = Object.assign({}, record)
      this.chineseNameChange1 = record.chineseName
      this.toolModelChange1 = '-'+record.toolModel
      this.headSpecificationsChange1 = '-'+record.headSpecifications
      this.leadAngleChange1 = '-'+record.leadAngle
       //通过id查询管理参数和参数数据
      getAction(this.url.queryParaByToolCode, {
        toolCode: record.toolCodeId,

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

@@ -1,7 +1,7 @@
<template>
  <j-modal
    :title="title"
    :width="800"
    :width="1200"
    :visible="visible"
    centered
    :confirmLoading="confirmLoading"
@@ -12,201 +12,360 @@
    <a-spin :spinning="confirmLoading">
      <a-form-model ref="form" :model="model"  :labelCol="labelCol" :wrapperCol="wrapperCol">
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="chineseName" label="中文名称">
              <a-input
                :placeholder="'请输入中文名称'"
                v-model="model.chineseName"
              />
              <a-input :placeholder="'请输入中文名称'" v-model="model.chineseName" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="foreignLanguageName" label="外文名称">
              <a-input
                :placeholder="'请输入外文名称'"
                v-model="model.foreignLanguageName"
              />
              <a-input :placeholder="'请输入外文名称'" v-model="model.foreignLanguageName" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="shortCalled" label="工具简称">
              <a-input
                :placeholder="'请输入工具简称'"
                v-model="model.shortCalled"
              />
              <a-input :placeholder="'请输入工具简称'" v-model="model.shortCalled" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
        </a-row>
        <a-row :gutter="24">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanyCode" label="集团公司编码">
              <a-input
                :placeholder="'请输入集团公司编码'"
                v-model="model.groupCompanyCode"
              />
              <a-input :placeholder="'请输入集团公司编码'" v-model="model.groupCompanyCode" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="groupCompanySign" label="标记">
              <a-input :placeholder="'请输入标记'" v-model="model.groupCompanySign" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="standardLevel" label="标准级别">
              <a-input
                :placeholder="'请输入标准级别'"
                v-model="model.standardLevel"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input
                :placeholder="'请输入标准号'"
                v-model="model.standardCode"
              />
              <a-input :placeholder="'请输入标准级别'" v-model="model.standardLevel" />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item prop="standardCode" label="标准号">
              <a-input :placeholder="'请输入标准号'" v-model="model.standardCode" />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item prop="toolModel" label="型号/图号">
              <a-input
                :placeholder="'请输入型号/图号'"
                v-model="model.toolModel"
              />
              <a-input :placeholder="'请输入型号/图号'" v-model="model.toolModel" />
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刀头规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
              <a-input
                v-model="model.headSpecifications"
                :placeholder="'请输入刀头规格'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="配套刀片号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="matchingNumber">
              <a-input
                v-model="model.matchingNumber"
                :placeholder="'请输入配套刀片号'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="主偏角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
              <a-input
                v-model="model.leadAngle"
                :placeholder="'请输入主偏角'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具总长" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="totalLength">
              <a-input
                v-model="model.totalLength"
                :placeholder="'请输入刀具总长'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <a-input
                v-model="model.toolMaterial"
                :placeholder="'请输入刀具材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item label="零件材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="partMaterial">
              <a-input
                v-model="model.partMaterial"
                :placeholder="'请输入零件材料'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group
                v-model="model.paintcoatFlag"
                :placeholder="'请选择是否涂层'"
              >
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
              <a-input v-model="model.partMaterial" :placeholder="'请输入零件材料'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <a-input
                v-model="model.toolPattern"
                :placeholder="'请输入刀具型式'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item
              label="刀具截面尺寸"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="crossSectionalSize"
            >
              <a-input
                v-model="model.crossSectionalSize"
                :placeholder="'请输入刀具截面尺寸'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
            <a-form-model-item label="切削方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
              <a-input
                v-model="model.cuttingDirection"
                :placeholder="'请输入切削方向'"
              ></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <a-input
                v-model="model.coolingMethod"
                :placeholder="'请输入冷却方式'"
              ></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="technicalConditions"
            >
              <a-input
                v-model="model.technicalConditions"
                :placeholder="'请输入附加技术条件'"
              ></a-input>
              <a-input v-model="model.technicalConditions" :placeholder="'请输入附加技术条件'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="12">
          <a-col :span="8">
            <a-form-model-item
              label="附加技术条件说明"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="conditionsInfo"
            >
              <a-input
                v-model="model.conditionsInfo"
                :placeholder="'请输入附加技术条件说明'"
              ></a-input>
              <a-input v-model="model.conditionsInfo" :placeholder="'请输入附加技术条件说明'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand">
              <a-input v-model="model.brand" :placeholder="'请输入品牌'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀头规格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="headSpecifications">
              <a-input v-model="model.headSpecifications" :placeholder="'请输入刀头规格'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="配套刀片号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="matchingNumber">
              <a-input v-model="model.matchingNumber" :placeholder="'请输入配套刀片号'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀夹型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="knifeClipModel">
              <a-input v-model="model.knifeClipModel" :placeholder="'请输入刀夹型号'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="主偏角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leadAngle">
              <a-input v-model="model.leadAngle" :placeholder="'请输入主偏角'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀具截面尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="crossSectionalSize">
              <a-input v-model="model.crossSectionalSize" :placeholder="'请输入刀具截面尺寸'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀片尺寸" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="knifeSize">
              <a-input v-model="model.knifeSize" :placeholder="'请输入刀片尺寸'"></a-input>
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀片后角" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladePosterior">
              <a-input v-model="model.bladePosterior" :placeholder="'请输入刀片后角'"></a-input>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="精度等级" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="accuracyClass">
              <j-dict-select-tag
                type="list"
                v-model="model.accuracyClass"
                :triggerChange="true"
                dictCode="accuracy_class"
                placeholder="请选择精度等级"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="切削方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="cuttingDirection">
              <j-dict-select-tag
                type="list"
                v-model="model.cuttingDirection"
                :triggerChange="true"
                dictCode="cutting_direction"
                placeholder="请选择切削方向"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀具材料" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolMaterial">
              <j-dict-select-tag
                type="list"
                v-model="model.toolMaterial"
                :triggerChange="true"
                dictCode="tool_material"
                placeholder="请选择刀具材料"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀具型式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="toolPattern">
              <j-dict-select-tag
                type="list"
                v-model="model.toolPattern"
                :triggerChange="true"
                dictCode="tool_pattern"
                placeholder="请选择刀具型式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="制式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="types">
              <j-dict-select-tag
                type="list"
                v-model="model.types"
                :triggerChange="true"
                dictCode="types"
                placeholder="请选择制式"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="冷却方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="coolingMethod">
              <j-dict-select-tag
                type="list"
                v-model="model.coolingMethod"
                :triggerChange="true"
                dictCode="cooling_method"
                placeholder="请选择冷却方式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="接口紧固形式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="fasteningForm">
              <j-dict-select-tag
                type="list"
                v-model="model.fasteningForm"
                :triggerChange="true"
                dictCode="fastening_form"
                placeholder="请选择接口紧固形式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀杆类别" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="holderCategory">
              <j-dict-select-tag
                type="list"
                v-model="model.holderCategory"
                :triggerChange="true"
                dictCode="holder_category"
                placeholder="请选择刀杆类别"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="刀片形状" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="bladeShape">
              <j-dict-select-tag
                type="list"
                v-model="model.bladeShape"
                :triggerChange="true"
                dictCode="blade_shape"
                placeholder="请选择刀片形状"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀片装夹方式" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="clampingMethod">
              <j-dict-select-tag
                type="list"
                v-model="model.clampingMethod"
                :triggerChange="true"
                dictCode="clamping_method"
                placeholder="请选择刀片装夹方式"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-model-item label="刀杆方向" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="barDirection">
              <j-dict-select-tag
                type="list"
                v-model="model.barDirection"
                :triggerChange="true"
                dictCode="bar_direction"
                placeholder="请选择刀杆方向"
              />
            </a-form-model-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-model-item label="是否涂层" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="paintcoatFlag">
              <a-radio-group v-model="model.paintcoatFlag" :placeholder="'请选择是否涂层'">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="刀具总长">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallTotalLength"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigTotalLength"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="镗杆直径">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBoringBarDiameter"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBoringBarDiameter"></a-input>
            </a-form-item>
          </a-col>
          
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="刀杆长度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeLength"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeLength"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="刀具直径">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallToolDiameter"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigToolDiameter"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="刀杆高度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeHeight"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeHeight"></a-input>
            </a-form-item>
          </a-col>
          
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="刀杆尺寸">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeSize"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeSize"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="刀片槽宽">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallSlotWidth"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigSlotWidth"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="最小切入直径">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallSmallDiameter"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigSmallDiameter"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="最大切入直径">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallMaxDiameter"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigMaxDiameter"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="最大切槽深度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallMaxDepth"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigMaxDepth"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="最小加工直径">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallMinDiameter"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigMinDiameter"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="8">
            <a-form-item label="刀板厚度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeThickness"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeThickness"></a-input>
            </a-form-item>
          </a-col>
          <a-col :span="8">
            <a-form-item label="刀杆宽度">
              <a-input placeholder="请输入最小值" class="query-group-cust" v-model="model.smallBladeWide"></a-input>
              <span class="query-group-split-cust"></span>
              <a-input placeholder="请输入最大值" class="query-group-cust" v-model="model.bigBladeWide"></a-input>
            </a-form-item>
          </a-col>
        </a-row>
      </a-form-model>
@@ -258,26 +417,68 @@
    },
     
    searchQuery(){
      this.searchParams.chineseName = this.model.chineseName
      this.searchParams.foreignLanguageName = this.model.foreignLanguageName
      this.searchParams.standardLevel = this.model.standardLevel
      this.searchParams.standardCode = this.model.standardCode
      this.searchParams.headSpecifications = this.model.headSpecifications
      this.searchParams.matchingNumber = this.model.matchingNumber
      this.searchParams.leadAngle = this.model.leadAngle
      this.searchParams.totalLength = this.model.totalLength
      this.searchParams.toolMaterial = this.model.toolMaterial
      this.searchParams.partMaterial = this.model.partMaterial
      this.searchParams.paintcoatFlag = this.model.paintcoatFlag
      this.searchParams.toolPattern = this.model.toolPattern
      this.searchParams.crossSectionalSize = this.model.crossSectionalSize
      this.searchParams.coolingMethod = this.model.coolingMethod
      this.searchParams.cuttingDirection = this.model.cuttingDirection
      this.searchParams.technicalConditions = this.model.technicalConditions
      this.searchParams.conditionsInfo = this.model.conditionsInfo
      this.searchParams.toolModel = this.model.toolModel
      this.searchParams.shortCalled = this.model.shortCalled
      this.searchParams.groupCompanyCode = this.model.groupCompanyCode
      const fields = [
        'chineseName',
        'foreignLanguageName',
        'shortCalled',
        'groupCompanyCode',
        'groupCompanySign',
        'standardLevel',
        'standardCode',
        'toolModel',
        'partMaterial',
        'technicalConditions',
        'conditionsInfo',
        'brand',
        'headSpecifications',
        'matchingNumber',
        'knifeClipModel',
        'leadAngle',
        'crossSectionalSize',
        'knifeSize',
        'bladePosterior',
        'accuracyClass',
        'cuttingDirection',
        'toolMaterial',
        'toolPattern',
        'types',
        'paintcoatFlag',
        'coolingMethod',
        'fasteningForm',
        'holderCategory',
        'bladeShape',
        'clampingMethod',
        'barDirection',
        'smallTotalLength',
        'bigTotalLength',
        'smallBoringBarDiameter',
        'bigBoringBarDiameter',
        'smallBladeLength',
        'bigBladeLength',
        'smallToolDiameter',
        'bigToolDiameter',
        'smallBladeHeight',
        'bigBladeHeight',
        'smallBladeWide',
        'bigBladeWide',
        'smallBladeSize',
        'bigBladeSize',
        'smallSlotWidth',
        'bigSlotWidth',
        'smallSmallDiameter',
        'bigSmallDiameter',
        'smallMaxDiameter',
        'bigMaxDiameter',
        'smallMaxDepth',
        'bigMaxDepth',
        'smallMinDiameter',
        'bigMinDiameter',
        'smallBladeThickness',
        'bigBladeThickness'
      ]
      fields.forEach((field) => {
        this.searchParams[field] = this.model[field]
      })
      this.close()
      this.$emit('searchParams',this.searchParams)
    },

 src/views/tms/modules/inbound/InboundApplyModelList.vue

@@ -268,7 +268,7 @@
          postAction(this.url.addApplyInStorage, formData)
            .then((res) => {
              if (res.success) {
                that.$message.success(res.message)
                that.$message.success("入库成功")
                that.$emit('ok', new Date())
              } else {
                that.$message.warning(res.message)

 src/views/tms/modules/inbound/InboundListRight.vue

@@ -50,7 +50,7 @@
    <div class="table-operator">
       <Tooltip
        placement="top"
        title="选择叶子节点后再执行新增"
        title="选择没有下级分类的节点后再执行新增"
      >
          <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '2'">新增</a-button>
      </Tooltip>
@@ -239,11 +239,11 @@
            align:"center",
            dataIndex: 'inNumber'
          },
          // {
          //   title:'备注',
          //   align:"center",
          //   dataIndex: 'remark'
          // },
          {
            title:'入库时间',
            align:"center",
            dataIndex: 'inboundTime'
          },
          {
            title:'创建人',
            align:"center",
@@ -355,19 +355,19 @@
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows
        //通过id查询管理参数和参数数据
        getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.paraTypeFlag}).then((res) => {
        getAction(this.url.queryParaByToolCode, { toolCode: this.selectionRows[0].toolCodeId,paraTypeFlag:this.selectionRows[0].paraTypeFlag}).then((res) => {
          if (res.success) {
            if(this.paraTypeFlag === "1"){
            if(this.selectionRows[0].paraTypeFlag === "1"){
              this.$refs.paraCommonToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "2"){
            }else if(this.selectionRows[0].paraTypeFlag === "2"){
              this.$refs.paraHoleToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "3"){
            }else if(this.selectionRows[0].paraTypeFlag === "3"){
              this.$refs.paraThreadingToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "4"){
            }else if(this.selectionRows[0].paraTypeFlag === "4"){
              this.$refs.paraMillToolList.getPara(res.result);
            }else if(this.paraTypeFlag === "5"){
            }else if(this.selectionRows[0].paraTypeFlag === "5"){
              this.$refs.paraTurningToolsList.getPara(res.result);
            }else if(this.paraTypeFlag === "6"){
            }else if(this.selectionRows[0].paraTypeFlag === "6"){
              this.$refs.paraBladeList.getPara(res.result);
            }
          } else {

 src/views/tms/modules/inbound/InboundModel.vue

@@ -354,7 +354,7 @@
                  }));
                  this.handleBacthPrint();
                }else{
                   that.$message.success("保存成功")
                   that.$message.success("入库成功")
                }
                that.$emit('ok', new Date())
              } else {

 src/views/tms/modules/inboundOrder/JSelectToolingModal.vue

@@ -142,7 +142,7 @@
      loading: false,
      url: {
        // list: '/base/tooling/list',
         list: '/tms/baseTools/selectToolList',
         list: '/tms/baseTools/paraCommonToolList',
      },
    }
  },

 src/views/tms/modules/toolLedger/InStoreDetailList.vue

@@ -87,6 +87,11 @@
          dataIndex: 'inNumber',
          align: 'center',
        },
        {
          title: '入库时间',
          dataIndex: 'inboundTime',
          align: 'center',
        },
      ],
      para:{},
    }

 src/views/tms/modules/toolLedger/ToolLedgerListRight.vue

@@ -131,7 +131,7 @@
        forceRender
      >
        <span slot="tab">
          <a-badge>把号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
          <a-badge>工具编号&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</a-badge>
        </span>
        <tool-ledger-detail-list ref="toolLedgerDetailList"></tool-ledger-detail-list>
      </a-tab-pane>

 src/views/tms/modules/toolsClassify/ToolsClassifyForm.vue

@@ -24,10 +24,10 @@
            </a-form-model-item>
          </a-col>
          <a-col :span="12" v-show="leafFlagShow">
            <a-form-model-item label="是否为叶子节点" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
              <a-radio-group v-model="model.leafFlag" placeholder="请选择是否叶子节点" @change="leafFlagChange">
                <a-radio :value="'1'">是</a-radio>
                <a-radio :value="'2'">否</a-radio>
            <a-form-model-item label="是否有下级分类" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="leafFlag">
              <a-radio-group v-model="model.leafFlag" placeholder="请选择是否有下级分类" @change="leafFlagChange">
                <a-radio :value="'1'">否</a-radio>
                <a-radio :value="'2'">是</a-radio>
              </a-radio-group>
            </a-form-model-item>
          </a-col>
@@ -115,7 +115,7 @@
              { required: true, message: '请输入工具分类名称!'},
           ],
           leafFlag: [
              { required: true, message: '请选择是否为叶子节点!'},
              { required: true, message: '请选择是否有下级分类!'},
           ],
           paraTypeFlag: [
            { required: true, message: '请选择参数模板!' },

 src/views/tms/modules/toolsClassify/ToolsClassifyListRight.vue

@@ -54,10 +54,10 @@
      >
          <a-button @click="handleAdd(nodeSelected)" type="primary" icon="plus" :disabled="!nodeSelected.key || nodeSelected.entity.leafFlag === '1'">新增</a-button>
      </Tooltip>
      <a-button type="primary" icon="download" @click="handleExportXls('工具分类信息')">导出</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-upload> -->
    </div>

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