From 6c7ca8b4290cd6afecb680c39be00fc2480a2dca Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 21 九月 2023 14:30:58 +0800
Subject: [PATCH] 现场问题修改

---
 src/views/eam/modules/faultCause/FaultCause2List.vue               |   52 ++-
 src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue |   99 ++++---
 src/views/eam/modules/equipmentNew/EquipmentModal.vue              |  193 ++++++++------
 src/views/eam/modules/faultCause/FaultCauseModel.vue               |    2 
 src/views/eam/RiskPreventionList.vue                               |  213 ++++++++++++---
 src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue |  194 ++++++++------
 6 files changed, 466 insertions(+), 287 deletions(-)

diff --git a/src/views/eam/RiskPreventionList.vue b/src/views/eam/RiskPreventionList.vue
index 26a3f14..f6d052e 100644
--- a/src/views/eam/RiskPreventionList.vue
+++ b/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}`
     }
   },
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
index c0d27dc..f485f6d 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategory2List.vue
+++ b/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',
-
         },
 
         // {
diff --git a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue b/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
index c559867..65c6c0d 100644
--- a/src/views/eam/modules/equipmentCategory/EquipmentCategoryModel.vue
+++ b/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>
diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index a9b5db4..c2d6c38 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/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: '闈濧绫昏澶囷紝鏄惁瑕佹坊鍔犲叧閿澶囨爣璇嗭紒',
-            okText: '纭',
-            cancelText: '鍙栨秷',
-            onOk() {
-              that.needSpecific = true;
-            },
-            onCancel(){
-              that.needSpecific = false;
-            }
+          title: '鎻愮ず',
+          content: '闈濧绫昏澶囷紝鏄惁瑕佹坊鍔犲叧閿澶囨爣璇嗭紒',
+          okText: '纭',
+          cancelText: '鍙栨秷',
+          onOk() {
+            that.needSpecific = true;
+          },
+          onCancel() {
+            that.needSpecific = false;
+          }
         })
-       }
+      }
     }
   },
   computed: {
diff --git a/src/views/eam/modules/faultCause/FaultCause2List.vue b/src/views/eam/modules/faultCause/FaultCause2List.vue
index fa68cdb..96d166d 100644
--- a/src/views/eam/modules/faultCause/FaultCause2List.vue
+++ b/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",
diff --git a/src/views/eam/modules/faultCause/FaultCauseModel.vue b/src/views/eam/modules/faultCause/FaultCauseModel.vue
index fcfe245..d8e176b 100644
--- a/src/views/eam/modules/faultCause/FaultCauseModel.vue
+++ b/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 ]"
               />

--
Gitblit v1.9.3