现场问题修改

qushaowei

2023-09-21 6c7ca8b4290cd6afecb680c39be00fc2480a2dca

现场问题修改

 src/views/eam/RiskPreventionList.vue

@@ -1,26 +1,65 @@
<template>
  <a-card :bordered='false' title='危险防控'>
  <a-card
    :bordered='false'
    title='危险防控'
  >
    <!-- 查询区域 -->
    <div class='table-page-search-wrapper'>
      <a-form layout='inline' @keyup.enter.native='searchQuery'>
      <a-form
        layout='inline'
        @keyup.enter.native='searchQuery'
      >
        <a-row :gutter='24'>

          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
          <a-col
            :xl='6'
            :lg='7'
            :md='8'
            :sm='24'
          >
            <a-form-item label='危险源编码'>
              <j-input placeholder='请输入危险源编码' v-model='queryParam.num'></j-input>
              <j-input
                placeholder='请输入危险源编码'
                v-model='queryParam.num'
              ></j-input>
            </a-form-item>
          </a-col>
          <template>
            <a-col :xl='6' :lg='7' :md='8' :sm='24'>
            <a-col
              :xl='6'
              :lg='7'
              :md='8'
              :sm='24'
            >
              <a-form-item label='危险源'>
                <j-input placeholder='请输入危险源' v-model='queryParam.name'></j-input>
                <j-input
                  placeholder='请输入危险源'
                  v-model='queryParam.name'
                ></j-input>
              </a-form-item>
            </a-col>
          </template>
          <a-col :xl='6' :lg='7' :md='8' :sm='24'>
            <span style='float: left;overflow: hidden;' class='table-page-search-submitButtons'>
              <a-button type='primary' @click='searchQuery' icon='search'>查询</a-button>
              <a-button type='primary' @click='searchReset' icon='reload' style='margin-left: 8px'>重置</a-button>
          <a-col
            :xl='6'
            :lg='7'
            :md='8'
            :sm='24'
          >
            <span
              style='float: left;overflow: hidden;'
              class='table-page-search-submitButtons'
            >
              <a-button
                type='primary'
                @click='searchQuery'
                icon='search'
              >查询</a-button>
              <a-button
                type='primary'
                @click='searchReset'
                icon='reload'
                style='margin-left: 8px'
              >重置</a-button>
              <!--              <a @click="handleToggleSearch" style="margin-left: 8px">-->
              <!--                {{ toggleSearchStatus ? '收起' : '展开' }}-->
              <!--                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>-->
@@ -34,16 +73,36 @@

    <!-- 操作按钮区域 -->
    <div class='table-operator'>
      <a-button @click='handleAdd' type='primary' icon='plus'>新增</a-button>
      <a-button type='primary' icon='download' @click="handleExportXls('危险防控')">导出</a-button>
      <a-upload name='file' :showUploadList='false' :multiple='false' :headers='tokenHeader' :action='importExcelUrl'
                @change='handleImportExcel'>
        <a-button type='primary' icon='import'>导入</a-button>
      <a-button
        @click='handleAdd'
        type='primary'
        icon='plus'
      >新增</a-button>
      <a-button
        type='primary'
        icon='download'
        @click="handleExportXls('危险防控')"
      >导出</a-button>
      <a-upload
        name='file'
        :showUploadList='false'
        :multiple='false'
        :headers='tokenHeader'
        :action='importExcelUrl'
        @change='handleImportExcel'
      >
        <a-button
          type='primary'
          icon='import'
        >导入</a-button>
      </a-upload>

      <a-dropdown v-if='selectedRowKeys.length > 0'>
        <a-menu slot='overlay'>
          <a-menu-item key='1' @click='batchDel'>
          <a-menu-item
            key='1'
            @click='batchDel'
          >
            <a-icon type='delete' />
            删除
          </a-menu-item>
@@ -56,10 +115,15 @@

    <!-- table区域-begin -->
    <div>
      <div class='ant-alert ant-alert-info' style='margin-bottom: 16px;'>
        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a
        style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a style='margin-left: 24px' @click='onClearSelected'>清空</a>
      <div
        class='ant-alert ant-alert-info'
        style='margin-bottom: 16px;'
      >
        <i class='anticon anticon-info-circle ant-alert-icon'></i> 已选择 <a style='font-weight: 600'>{{ selectedRowKeys.length }}</a>项
        <a
          style='margin-left: 24px'
          @click='onClearSelected'
        >清空</a>
      </div>

      <a-table
@@ -74,25 +138,47 @@
        :loading='loading'
        :rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
        class='j-table-force-nowrap'
        @change='handleTableChange'>
        <template slot="description" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
        @change='handleTableChange'
      >
        <template
          slot="description"
          slot-scope="text"
        >
          <a-tooltip
            placement="top"
            :title="text"
            trigger="hover"
          >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
            </div>
          </a-tooltip>
        </template>
        <template slot="num" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
        <template
          slot="num"
          slot-scope="text"
        >
          <a-tooltip
            placement="top"
            :title="text"
            trigger="hover"
          >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
            </div>
          </a-tooltip>
        </template>
        <template slot="measure" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
        <template
          slot="measure"
          slot-scope="text"
        >
          <a-tooltip
            placement="top"
            :title="text"
            trigger="hover"
          >
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -100,28 +186,53 @@
          </a-tooltip>
        </template>

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

        <span slot='action' slot-scope='text, record'>
        <span
          slot='action'
          slot-scope='text, record'
        >
          <a @click='handleEdit(record)'>编辑</a>

          <a-divider type='vertical' />
@@ -132,7 +243,10 @@
                <a @click='handleDetail(record)'>详情</a>
              </a-menu-item>
              <a-menu-item>
                <a-popconfirm title='确定删除吗?' @confirm='() => handleDelete(record.id)'>
                <a-popconfirm
                  title='确定删除吗?'
                  @confirm='() => handleDelete(record.id)'
                >
                  <a>删除</a>
                </a-popconfirm>
              </a-menu-item>
@@ -143,7 +257,10 @@
      </a-table>
    </div>

    <risk-prevention-modal ref='modalForm' @ok='modalFormOk'></risk-prevention-modal>
    <risk-prevention-modal
      ref='modalForm'
      @ok='modalFormOk'
    ></risk-prevention-modal>
  </a-card>
</template>

@@ -171,7 +288,7 @@
          key: 'rowIndex',
          width: 60,
          align: 'center',
          customRender: function(t, r, index) {
          customRender: function (t, r, index) {
            return parseInt(index) + 1
          }
        },
@@ -179,8 +296,8 @@
          title: ' 危险源编码',
          align: 'center',
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          ellipsis: true,
          // scopedSlots: { customRender: 'num' },
          // ellipsis: true,
        },
        {
          title: '危险源名称',
@@ -191,17 +308,17 @@
          title: '危险描述',
          align: 'center',
          dataIndex: 'description',
          scopedSlots: { customRender: 'description' },
          width: 100,
          ellipsis: true,
          // scopedSlots: { customRender: 'description' },
          // width: 100,
          // ellipsis: true,
        },
        {
          title: '防控措施',
          align: 'center',
          dataIndex: 'measure',
          scopedSlots: { customRender: 'measure' },
          width: 100,
          ellipsis: true,
          // scopedSlots: { customRender: 'measure' },
          // width: 100,
          // ellipsis: true,
        },
        {
          title: '创建人',
@@ -254,7 +371,7 @@
    this.getSuperFieldList()
  },
  computed: {
    importExcelUrl: function() {
    importExcelUrl: function () {
      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
    }
  },

 src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue

@@ -69,7 +69,10 @@
        icon="download"
        @click="handleExportXls('设备分类报表')"
      >导出</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0" v-has="'equipmentCategory:add&Edit&delete'">
      <a-dropdown
        v-if="selectedRowKeys.length > 0"
        v-has="'equipmentCategory:add&Edit&delete'"
      >
        <a-button style="margin-left: 8px">
          批量操作
          <a-icon type="down" />
@@ -95,8 +98,15 @@
      @change="handleTableChange"
      :scroll="{ x: true}"
    >
      <template slot="num" slot-scope="text" >
        <a-tooltip placement="top" :title="text" trigger="hover">
      <template
        slot="num"
        slot-scope="text"
      >
        <a-tooltip
          placement="top"
          :title="text"
          trigger="hover"
        >
          <div>
            <template slot="title"> </template>
            <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -229,27 +239,27 @@
          },
          width: 50,
        },
      /*   {
          title: '上级设备分类编码',
          align: "center",
          dataIndex: 'parentNum',
          customRender:function(text, record){
              return record.parentName+text;
            }
          },

        {
          title: '上级设备分类名称',
          align: "center",
          dataIndex: 'parentName',
        }, */
        /*   {
            title: '上级设备分类编码',
            align: "center",
            dataIndex: 'parentNum',
            customRender:function(text, record){
                return record.parentName+text;
              }
            },
  
          {
            title: '上级设备分类名称',
            align: "center",
            dataIndex: 'parentName',
          }, */
        {
          title: '分类编码',
          align: "center",
          dataIndex: 'num',
          scopedSlots: { customRender: 'num' },
          width: 100,
          ellipsis: true,
          // scopedSlots: { customRender: 'num' },
          // width: 100,
          // ellipsis: true,
          // scopedSlots: {
          //   customRender: 'num',
          // },
@@ -266,33 +276,38 @@
          // },
          // sorter: true,
        },
        {
          title: '分类标识',
        // {
        //   title: '分类标识',

          align: "center",
          dataIndex: 'equipmentCategoryUda1_dictText',
          // scopedSlots: {
          //   customRender: 'name',
          // },
          // sorter: true,
        //   align: "center",
        //   dataIndex: 'equipmentCategoryUda1_dictText',
        //   // scopedSlots: {
        //   //   customRender: 'name',
        //   // },
        //   // sorter: true,

        },
        {
          title: '技术状态鉴定周期',
        // },
        // {
        //   title: '技术状态鉴定周期',

          align: "center",
          dataIndex: 'equipmentCategoryUda2_dictText',
          // scopedSlots: {
          //   customRender: 'name',
          // },
          // sorter: true,
        //   align: "center",
        //   dataIndex: 'equipmentCategoryUda2_dictText',
        //   // scopedSlots: {
        //   //   customRender: 'name',
        //   // },
        //   // sorter: true,

        },
        // },
        {
          title: '创建人',
          align: "center",
          dataIndex: 'createBy',

        },
        {
          title: '创建时间',
          align: "center",
          dataIndex: 'createTime',
        },
        {
          title: '修改人',
@@ -301,17 +316,9 @@

        },
        {
          title: '创建时间',
          align: "center",
          dataIndex: 'createTime',

        },

        {
          title: '修改时间',
          align: "center",
          dataIndex: 'updateTime',

        },

        // {

 src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue

@@ -14,7 +14,7 @@
    <a-spin :spinning="confirmLoading">
      <a-form :form="form">

<!--        <a-row :gutter="24">
        <!--        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              label="上级设备分类编号"
@@ -60,7 +60,10 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="12" v-if="parentId!='-1'">
          <a-col
            :span="12"
            v-if="parentId!='-1'"
          >
            <a-form-item
              label="设备分类名称"
              :labelCol="labelCol"
@@ -74,13 +77,16 @@
              />
            </a-form-item>
          </a-col>
          <a-col :span="12" v-if="parentId=='-1'">
          <a-col
            :span="12"
            v-if="parentId=='-1'"
          >
            <a-form-item
              label="设备分类名称"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
            >
            <j-dict-select-tag
              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择分类名称'"
@@ -91,7 +97,10 @@
            </a-form-item>
          </a-col>
        </a-row>
          <a-row :gutter="24">
        <!-- <a-row
          hidden
          :gutter="24"
        >
          <a-col :span="12">
            <a-form-item
              :labelCol="labelCol"
@@ -114,7 +123,7 @@
              :wrapperCol="wrapperCol"
              label="技术状态鉴定周期"
            >
            <j-dict-select-tag
              <j-dict-select-tag
                allow-clear
                :disabled="disableSubmit"
                :placeholder="disableSubmit?'':'请选择技术状态鉴定周期'"
@@ -124,8 +133,8 @@
              />
            </a-form-item>
          </a-col>
        </a-row>
          <a-row :gutter="24">
        </a-row> -->
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item
              :labelCol="labelCol"
@@ -142,48 +151,63 @@
          </a-col>
        </a-row>
      </a-form>
      <a-divider  v-if="title!='新增'" orientation="center" style="font-size: large;font-style: italic;color: #66aeed;"> 选择子设备分类使其跟随父设备分类属性 </a-divider>
      <a-divider
        v-if="title!='新增'"
        orientation="center"
        style="font-size: large;font-style: italic;color: #66aeed;"
      > 选择子设备分类使其跟随父设备分类属性 </a-divider>
      <a-tabs
        type="card"
        defaultActiveKey="1"
        v-if="title!='新增'"
      >
      <a-tab-pane
        <a-tab-pane
          tab='子设备分类'
          key='1'

        >
      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
      </div>
      <a-table
      ref="table"
      bordered
      size="middle"
      rowKey="id"
      :columns="columns"
      :dataSource="dataSource"
      :pagination="ipagination"
      :loading="loading"
      :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
      @change="handleTableChange"
      :scroll="{ x: true}"
     >
        <template slot="num" slot-scope="text" >
          <a-tooltip placement="top" :title="text" trigger="hover">
            <div>
              <template slot="title"> </template>
              <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
            </div>
          </a-tooltip>
        </template>
          <div
            class="ant-alert ant-alert-info"
            style="margin-bottom: 16px;"
          >
            <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
            <a
              style="margin-left: 24px"
              @click="onClearSelected"
            >清空</a>
          </div>
          <a-table
            ref="table"
            bordered
            size="middle"
            rowKey="id"
            :columns="columns"
            :dataSource="dataSource"
            :pagination="ipagination"
            :loading="loading"
            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
            @change="handleTableChange"
            :scroll="{ x: true}"
          >
            <template
              slot="num"
              slot-scope="text"
            >
              <a-tooltip
                placement="top"
                :title="text"
                trigger="hover"
              >
                <div>
                  <template slot="title"> </template>
                  <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
                </div>
              </a-tooltip>
            </template>

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


    </a-tab-pane>
    </a-tabs>
        </a-tab-pane>
      </a-tabs>

    </a-spin>

@@ -194,7 +218,7 @@
      >
        关闭
      </a-button>
<!--      <a-button
      <!--      <a-button
        v-if="!this.model.id"
        :disabled="disableSubmit || confirmLoading"
        :loading="confirmLoading"
@@ -222,12 +246,12 @@

export default {
  name: 'EquipmentCategoryModel',
  mixins:[JeecgListMixin],
  props:{
    mainId:{
        type:String,
        default:'',
        required:false
  mixins: [JeecgListMixin],
  props: {
    mainId: {
      type: String,
      default: '',
      required: false
    },
  },
  data() {
@@ -239,10 +263,10 @@
      parentId: '',
      model: {},
      labelCol: {
        span:7
        span: 7
      },
      wrapperCol: {
        span:17
        span: 17
      },
      confirmLoading: false,
      form: this.$form.createForm(this),
@@ -261,7 +285,7 @@
            { validator: this.validateName },
          ]
        },
        equipmentCategoryUda1:{
        equipmentCategoryUda1: {
          rules: [
            { required: true, message: '请选择类别标识!' },
          ]
@@ -271,7 +295,7 @@
            { min: 0, max: 100, message: '长度不超过 100 个字符', trigger: 'blur' },
          ]
        },
        equipmentCategoryUda2:{
        equipmentCategoryUda2: {
          rules: [
            { required: true, message: '请选择技术状态鉴定周期!' },
          ]
@@ -280,7 +304,7 @@
      url: {
        add: "/eam/equipmentCategory/add",
        edit: "/eam/equipmentCategory/edit",
        list:"/eam/equipmentCategory/getAllChildren"
        list: "/eam/equipmentCategory/getAllChildren"
      },
      columns: [
        {
@@ -293,20 +317,20 @@
          },
          width: 50,
        },
      /*   {
          title: '上级设备分类编码',
          align: "center",
          dataIndex: 'parentNum',
          customRender:function(text, record){
              return record.parentName+text;
            }
          },

        {
          title: '上级设备分类名称',
          align: "center",
          dataIndex: 'parentName',
        }, */
        /*   {
            title: '上级设备分类编码',
            align: "center",
            dataIndex: 'parentNum',
            customRender:function(text, record){
                return record.parentName+text;
              }
            },
  
          {
            title: '上级设备分类名称',
            align: "center",
            dataIndex: 'parentName',
          }, */
        {
          title: '分类编码',
          align: "center",
@@ -385,7 +409,7 @@
      this.visible = true;
      this.disableSubmit = false;
      this.$nextTick(() => {
        this.form.setFieldsValue(pick(this.model, 'parentNum','equipmentCategoryUda1','equipmentCategoryUda2', 'parentName', 'num', 'name', 'remark'))
        this.form.setFieldsValue(pick(this.model, 'parentNum', 'equipmentCategoryUda1', 'equipmentCategoryUda2', 'parentName', 'num', 'name', 'remark'))
      });
      if (record.id) {
        this.codeDisable = true;
@@ -400,12 +424,12 @@
      this.onClearSelected();
    },
    onSelectChange(selectedRowKeys, selectionRows) {
        this.selectedRowKeys = selectedRowKeys;
        this.selectionRows = selectionRows;
      this.selectedRowKeys = selectedRowKeys;
      this.selectionRows = selectionRows;
    },
    onClearSelected() {
        this.selectedRowKeys = [];
        this.selectionRows = [];
      this.selectedRowKeys = [];
      this.selectionRows = [];
    },

    //保存并新增按钮触发
@@ -510,10 +534,10 @@
        }
      })
    },
    clearList(){
        this.dataSource=[]
        this.selectedRowKeys=[]
        this.ipagination.current = 1
    clearList() {
      this.dataSource = []
      this.selectedRowKeys = []
      this.ipagination.current = 1
    }

  },
@@ -521,17 +545,17 @@
    alterFlag() {
      this.$bus.$emit('queryTreeData');
    },
    mainId:{
       immediate:true,
       handler(val) {
          if(!this.mainId){
            this.clearList()
          }else{
            this.queryParam['parentId'] = val
            this.loadData(1);
          }
    mainId: {
      immediate: true,
      handler(val) {
        if (!this.mainId) {
          this.clearList()
        } else {
          this.queryParam['parentId'] = val
          this.loadData(1);
        }
     },
      }
    },
  }
}
</script>

 src/views/eam/modules/equipmentNew/EquipmentModal.vue

@@ -128,24 +128,7 @@
            orientation="center"
            style="font-size: large;font-style: italic;color: #66aeed;"
          >维护及使用信息</a-divider>
          <a-col :span="6">
            <a-form-model-item
              label="维护部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维护部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>

          <a-col :span="6">
            <a-form-model-item
              label="使用部门"
@@ -166,6 +149,41 @@
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择车间"
                :triggerChange="true"
                dictCode="mom_base_area,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修部门"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="manageId"
            >
              <a-tree-select
                :disabled="formDisabled"
                style="width: 100%"
                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
                :tree-data="treeData"
                placeholder="请选择维修部门"
                tree-default-expand-all
                v-model="model.manageId"
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="维修班组"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
@@ -181,26 +199,10 @@
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
            <a-form-model-item
              label="车间"
              :labelCol="labelCol"
              :wrapperCol="wrapperCol"
              prop="factoryModelId"
            >
              <j-dict-select-tag
                allow-clear
                :disabled="formDisabled"
                placeholder="请选择资车间"
                :triggerChange="true"
                dictCode="mom_base_factory_model,name,id,del_flag!='1'"
                v-model="model.factoryModelId"
              />
            </a-form-model-item>
          </a-col>

        </a-row>
        <a-row>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-model-item
              label="产线"
              :labelCol="labelCol"
@@ -216,7 +218,7 @@
                v-model="model.workCenterId"
              />
            </a-form-model-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-model-item
              label="资产制造商"
@@ -304,7 +306,13 @@
              :wrapperCol="wrapperCol"
              prop="warrantyStart"
            >
            <j-date  :disabled="formDisabled" style="width: 100%;" placeholder="请选择开始日期" class="query-group-cust" v-model="model.warrantyStart"></j-date>
              <j-date
                :disabled="formDisabled"
                style="width: 100%;"
                placeholder="请选择开始日期"
                class="query-group-cust"
                v-model="model.warrantyStart"
              ></j-date>
            </a-form-model-item>
          </a-col>
          <a-col :span="6">
@@ -314,7 +322,13 @@
              :wrapperCol="wrapperCol"
              prop="warrantyEnd"
            >
            <j-date  :disabled="formDisabled" style="width: 100%;" placeholder="请选择结束日期" class="query-group-cust" v-model="model.warrantyEnd"></j-date>
              <j-date
                :disabled="formDisabled"
                style="width: 100%;"
                placeholder="请选择结束日期"
                class="query-group-cust"
                v-model="model.warrantyEnd"
              ></j-date>
            </a-form-model-item>
          </a-col>
        </a-row>
@@ -352,7 +366,7 @@
              />
            </a-form-model-item>
          </a-col>
       

          <a-col :span="6">
            <a-form-model-item
              label="验收日期"
@@ -384,7 +398,7 @@
          </a-col>
        </a-row>
        <a-row>
          <a-col :span="6">
          <!-- <a-col :span="6">
            <a-form-model-item
              label="工区"
              :labelCol="labelCol"
@@ -397,7 +411,7 @@
                :disabled="formDisabled"
              ></a-input>
            </a-form-model-item>
          </a-col>
          </a-col> -->
          <a-col :span="6">
            <a-form-model-item
              label="重量"
@@ -412,7 +426,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
      

          <a-col :span="6">
            <a-form-model-item
              label="重量计量单位"
@@ -471,7 +485,7 @@
              ></a-input>
            </a-form-model-item>
          </a-col>
      

          <a-col :span="6">
            <a-form-model-item
              label="资产来源国家"
@@ -749,7 +763,10 @@
              />
            </a-form-model-item>
          </a-col>
          <a-col :span="6" v-if="needSpecific">
          <a-col
            :span="6"
            v-if="needSpecific"
          >
            <a-form-model-item
              label="关键设备标识"
              :labelCol="labelCol"
@@ -926,44 +943,44 @@
        equipmentCategoryId: [
          { required: true, message: '请选则设备类别!' },
        ],
        specification:[
        { required: true, message: '请选则设备规格!' },
        specification: [
          { required: true, message: '请选则设备规格!' },
        ],
        model:[
        { required: true, message: '请选则设备型号!' },
        model: [
          { required: true, message: '请选则设备型号!' },
        ],
        equipmentImportanceId:[
        { required: true, message: '请选则设备ABC标识!' },
        equipmentImportanceId: [
          { required: true, message: '请选则设备ABC标识!' },
        ],
        manageId:[
        { required: true, message: '请选择维护部门!' },
        manageId: [
          { required: true, message: '请选择维护部门!' },
        ],
        useId:[
        { required: true, message: '请选择使用部门部门!' },
        useId: [
          { required: true, message: '请选择使用部门部门!' },
        ],
        specificEquipment:[
        { required: true, message: '请选择关键设备标识!' },
        specificEquipment: [
          { required: true, message: '请选择关键设备标识!' },
        ],
        equipmentStatus:[
        { required: true, message: '请选择设备状态!' },
        equipmentStatus: [
          { required: true, message: '请选择设备状态!' },
        ],
        technologyStatus:[
        { required: true, message: '请选择设备状态!' },
        technologyStatus: [
          { required: true, message: '请选择设备状态!' },
        ],
        workCenterId:[
        { required: true, message: '请选择设备产线!' },
        workCenterId: [
          { required: true, message: '请选择设备产线!' },
        ],
        factoryModelId:[
        { required: true, message: '请选择设备车间!' },
        factoryModelId: [
          { required: true, message: '请选择设备车间!' },
        ],
        warrantyStart:[
        { required: true, message: '请选择开始日期!' },
        warrantyStart: [
          { required: true, message: '请选择开始日期!' },
        ],
        warrantyEnd:[
        { required: true, message: '请选择结束日期!' },
        warrantyEnd: [
          { required: true, message: '请选择结束日期!' },
        ],
        propertyStatus:[
        { required: true, message: '请选择资产状态!' },
        propertyStatus: [
          { required: true, message: '请选择资产状态!' },
        ],
      },
      url: {
@@ -972,7 +989,7 @@
        loadOptions: '/sys/sysDepart/loadDepartTreeOptions',
      },
      treeData: [],
      needSpecific:false,
      needSpecific: false,

    }
  },
@@ -1141,7 +1158,7 @@
    sendPrecisionParametersTemplateRecord(data) {
      let record = data.record;
      this.model.precisionParametersTemplateId = record.id
      this.model.precisionParametersTemplateId_dictText= record.name
      this.model.precisionParametersTemplateId_dictText = record.name
      this.model = Object.assign({}, this.model);
    },
    standardResultCompute() {
@@ -1165,24 +1182,24 @@
      this.model = Object.assign({}, this.model);

    },
    changeNeedSpecific(val){
       if(val=='A'){
          this.needSpecific=true;
       }else{
    changeNeedSpecific(val) {
      if (val == 'A') {
        this.needSpecific = true;
      } else {
        let that = this;
        this.$confirm({
            title: '提示',
            content: '非A类设备，是否要添加关键设备标识！',
            okText: '确认',
            cancelText: '取消',
            onOk() {
              that.needSpecific = true;
            },
            onCancel(){
              that.needSpecific = false;
            }
          title: '提示',
          content: '非A类设备，是否要添加关键设备标识！',
          okText: '确认',
          cancelText: '取消',
          onOk() {
            that.needSpecific = true;
          },
          onCancel() {
            that.needSpecific = false;
          }
        })
       }
      }
    }
  },
  computed: {

 src/views/eam/modules/faultCause/FaultCause2List.vue

@@ -94,16 +94,30 @@
      @change="handleTableChange"
      :scroll="{ x: true}"
    >
      <template slot="num" slot-scope="text" >
        <a-tooltip placement="top" :title="text" trigger="hover">
      <template
        slot="num"
        slot-scope="text"
      >
        <a-tooltip
          placement="top"
          :title="text"
          trigger="hover"
        >
          <div>
            <template slot="title"> </template>
            <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
          </div>
        </a-tooltip>
      </template>
      <template slot="name" slot-scope="text" >
        <a-tooltip placement="top" :title="text" trigger="hover">
      <template
        slot="name"
        slot-scope="text"
      >
        <a-tooltip
          placement="top"
          :title="text"
          trigger="hover"
        >
          <div>
            <template slot="title"> </template>
            <p style="cusor:pointer; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 130px;">{{ text }}</p>
@@ -240,27 +254,27 @@
          title: '故障原因编码',
          align: "center",
          dataIndex: 'num',
          width: 100,
          scopedSlots: {
            customRender: 'num'
          },
          ellipsis: true,
          // width: 100,
          // scopedSlots: {
          //   customRender: 'num'
          // },
          // ellipsis: true,
        },
        {
          title: '故障原因名称',
          width: 100,
          align: "center",
          dataIndex: 'name',
          scopedSlots: {
            customRender: 'name'
          },
          ellipsis: true,
          // width: 100,
          // scopedSlots: {
          //   customRender: 'name'
          // },
          // ellipsis: true,
        },
        {
          title: '故障原因分类',
          align: "center",
          dataIndex: 'parentName',
        },
        // {
        //   title: '故障原因分类',
        //   align: "center",
        //   dataIndex: 'parentName',
        // },
        {
          title: '创建人',
          align: "center",

 src/views/eam/modules/faultCause/FaultCauseModel.vue

@@ -53,8 +53,8 @@
              :wrapperCol="wrapperCol"
            >
              <a-input
                :disabled="disableSubmit"
                allow-clear
                :disabled="codeDisable"
                :placeholder="disableSubmit?'':'请输入故障原因编号'"
                v-decorator="['num', validatorRules.num ]"
              />