408249787@qq.com 3 дней назад
Родитель
Сommit
51237a00de

+ 5 - 1
src/views/check/check-detail/CheckDetail.vue

@@ -8,6 +8,8 @@
               <a-input v-model.trim="queryParam.keyword" placeholder="请输入名称/字段名称" />
             </a-form-item>
           </a-col>
+          <!-- 隐藏类型/标准类型搜索 -->
+          <!--
           <a-col :md="8" :sm="24">
             <a-form-item label="类型">
               <a-select v-model="queryParam.type" placeholder="请选择">
@@ -25,6 +27,7 @@
               </a-tree-select>
             </a-form-item>
           </a-col>
+          -->
           <a-col :md="8 || 24" :sm="24">
             <span class="table-page-search-submitButtons">
               <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
@@ -37,7 +40,8 @@
 
     <div class="table-operator" style="margin-bottom: 8px;">
       <a-button type="primary" icon="plus" @click="$refs.baseModal.base()">保养内容项</a-button>
-      <a-button style="margin-left: 3%;" type="primary" icon="plus" @click="previewSome()">勾选预览</a-button>
+      <!-- 隐藏勾选预览按钮 -->
+      <!-- <a-button style="margin-left: 3%;" type="primary" icon="plus" @click="previewSome()">勾选预览</a-button> -->
       <!--      <a-button style="margin-left: 3%;"  type="primary" icon="download" @click="doExport">导出数据</a-button>-->
       <a-button style="margin-left: 3%;" type="primary" icon="download" @click="doImport">导入标准文件</a-button>
       <a-button style="margin-left: 3%;" type="primary" icon="download"

+ 3 - 2
src/views/check/checkjob/CheckJob.vue

@@ -99,7 +99,7 @@
         <a-button style="margin-left: 8px" type="success" @click="handleMonth">本月</a-button>
         <a-button style="margin-left: 8px" type="success" @click="handleTuiCalendar">日历图</a-button>
         <a-button style="margin-left: 8px" type="primary" icon="profile" @click="handleAnnualPlan">年度计划表</a-button>
-        <a-button style="margin-left: 8px" type="primary" @click="handleExecuteBatch"
+        <!-- <a-button style="margin-left: 8px" type="primary" @click="handleExecuteBatch"
           :disabled="selectedRowKeys.length == 0">
           <a-icon style="margin-left: 8px" type="plus" />
           批量接收
@@ -108,7 +108,7 @@
           @click="handleFinishBatch">
           <a-icon type="plus" />
           批量完成
-        </a-button>
+        </a-button> -->
         <a-popconfirm :disabled="selectedRowKeys.length == 0"
           v-if="($auth('check-spot-jobs-edit') || $auth('check-polling-jobs-edit'))" title="是否要删除所选数据?"
           @confirm="batchDelete()">
@@ -575,6 +575,7 @@ export default {
         searchEndTime: null,
         filter: this.filter,
         status: this.status,
+        receiveOvertime: this.receiveOvertime,
         statusList: this.statusList
       }
       this.$refs.table.refresh(true)

+ 2 - 4
src/views/check/checkjob/PollingCheckJob.vue

@@ -1,5 +1,5 @@
 <template>
-  <CheckJob :check-type="2"/>
+  <CheckJob :check-type="2" :hide-batch="true" />
 </template>
 
 <script>
@@ -12,6 +12,4 @@ export default {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

+ 2 - 4
src/views/check/checkjob/PollingCheckJobFinish.vue

@@ -1,5 +1,5 @@
 <template>
-  <CheckJob :check-type="2" :status="DictCache.VALUE.CHECK_JOB_STATUS.FINISHED" :status-list="[]"/>
+  <CheckJob :check-type="2" :status="DictCache.VALUE.CHECK_JOB_STATUS.FINISHED" :status-list="[]" :hide-batch="true" />
 </template>
 
 <script>
@@ -12,6 +12,4 @@ export default {
 }
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

+ 9 - 5
src/views/check/checkjob/modules/DetailStandardCheckJob.vue

@@ -18,21 +18,25 @@
       </a-button>
       <a-button style="margin-left: 8px" type="primary" icon="download" @click="doExport">导出</a-button>
       <a-select style="margin-left: 8px;width:100px;" @change="statusChange" placeholder="请选择">
-        <a-select-option v-for="(label,value) in statusMap" :key="value" :label="label" :value="parseInt(value)">{{ label }}
+        <a-select-option v-for="(label, value) in statusMap" :key="value" :label="label" :value="parseInt(value)">{{
+          label }}
         </a-select-option>
       </a-select>
       <a-select style="margin-left: 8px;width:100px;" @change="levelChange" placeholder="请选择">
-        <a-select-option v-for="(label,value) in standardLevelMap" :key="value" :label="label" :value="parseInt(value)">{{ label }}
+        <a-select-option v-for="(label, value) in standardLevelMap" :key="value" :label="label"
+          :value="parseInt(value)">{{ label }}
         </a-select-option>
       </a-select>
     </div>
-    <a-table :data-source="data" :columns="columns" tableLayout="auto" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }" :scroll="{x: 1500, y: BaseTool.Constant.scrollY }" rowKey="id">
+    <a-table :data-source="data" :columns="columns" tableLayout="auto"
+      :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+      :scroll="{ x: 1500, y: BaseTool.Constant.scrollY }" rowKey="id">
       <span slot="action" slot-scope="record">
         <template>
           <a v-if="$auth('sb-infos-edit')" @click="handleView(record)">查看</a>
           <a-divider type="vertical" />
-          <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a>
-          <a-divider type="vertical" />
+          <!-- 去掉修改按钮 -->
+          <!-- <a v-if="$auth('sb-infos-edit')" @click="handleEdit(record)">修改</a> -->
           <a-popconfirm v-if="$auth('sb-infos-del')" title="是否要删除该条数据?" @confirm="batchDelete(record.id)">
             <a>删除</a>
           </a-popconfirm>

+ 3 - 0
src/views/check/checkstandard/CheckStandard.vue

@@ -71,9 +71,12 @@
         <a-button v-if="($auth('check-spot-standards-add') || $auth('check-polling-standards-add'))" type="primary"
           icon="plus" @click="handleBatchAdd">批量新增
         </a-button>
+        <!-- 隐藏批量调整标准按钮 -->
+        <!--
         <a-button v-if="($auth('check-spot-standards-add') || $auth('check-polling-standards-add'))"
           :disabled="selectedRowKeys.length === 0" type="primary" icon="plus" @click="handleBatchEdit">批量调整标准
         </a-button>
+        -->
         <!-- <a-button style="margin-left:8px;" type="primary" @click="doImport">
           <a-icon type="upload"/>
           新增导入

+ 2 - 2
src/views/check/checkstandard/modules/BaseForm.vue

@@ -65,8 +65,8 @@
           </a-form-item>
         </row-item>
         <row-item>
-          <a-form-item label="计划周期" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol"
-            style="margin-bottom:0;">
+          <a-form-item label="计划周期" required :labelCol="BaseTool.Constant.labelCol"
+            :wrapperCol="BaseTool.Constant.wrapperCol" style="margin-bottom:0;">
             <a-form-item :style="{ display: 'inline-block', width: '70%' }">
               <a-input-number style="width: 100%" :min="1"
                 v-decorator="['period', { rules: [{ required: true, message: '计划周期不能为空' }] }]" />

+ 3 - 3
src/views/check/checkstandard/modules/Detail.vue

@@ -7,7 +7,7 @@
       <!--      <detail-list-item term="检查类型">{{ BaseTool.Object.getField(typeMap,model.type) }}</detail-list-item>-->
       <detail-list-item term="维护等级">{{ BaseTool.Object.getField(levelMap, model.level) }}</detail-list-item>
       <detail-list-item term="计划周期">{{ model.period }}{{ BaseTool.Object.getField(periodTypeMap, model.periodType)
-        }}</detail-list-item>
+      }}</detail-list-item>
       <detail-list-item term="标准工时">{{ model.standardHours }}</detail-list-item>
       <detail-list-item term="上次实际日期">{{ model.lastDate }}</detail-list-item>
       <detail-list-item term="下次预计日期">{{ model.nextDate }}</detail-list-item>
@@ -62,9 +62,9 @@
     <title-divider title="关联备件" width="90px"></title-divider>
     <a-table :data-source="data" :columns="columns" bordered tableLayout="auto" rowKey="bomId">
     </a-table>
-    <template slot="footer">
+    <!-- <template slot="footer">
       <a-button :loading="confirmLoading" type="primary" @click="handleCancel()">返回</a-button>
-    </template>
+    </template> -->
   </a-modal>
 </template>
 

+ 1 - 1
src/views/repair/application-form/RepairForm.vue

@@ -71,7 +71,7 @@
       </div>
 
       <div class="table-operator">
-        <a-button v-if="$auth('repair-application-forms-add')" type="primary" icon="plus"
+        <a-button v-if="$auth('repair-application-forms-add') && filter != 0 && searchType != 2" type="primary" icon="plus"
           @click="$refs.baseModal.base({}, { filter: -1 })">新增</a-button>
         <a-button style="margin-left: 8px" v-if="$auth('repair-application-forms-export')" type="primary"
           icon="download" @click="doExport">导出</a-button>

+ 3 - 1
src/views/repair/application-form/modules/BaseForm.vue

@@ -98,7 +98,9 @@
         </row-item>
         <row-item>
           <a-form-item label="故障类型" :labelCol="BaseTool.Constant.labelCol" :wrapperCol="BaseTool.Constant.wrapperCol">
-            <a-select style="width: 100%" v-decorator="['repairErrorTypeId']" placeholder="请选择" allowClear>
+            <a-select style="width: 100%"
+              v-decorator="['repairErrorTypeId', { rules: [{ required: true, message: '故障类型不能为空' }] }]"
+              placeholder="请选择" allowClear>
               <a-select-option v-for="(label, value) in faultTypeMap" :key="value" :label="label" :value="value">{{
                 label
               }}

+ 87 - 63
src/views/repair/application-form/modules/DetailRepair.vue

@@ -4,19 +4,37 @@
       <a-row :gutter="48" slot="extra">
         <a-col :md="48" :sm="48">
           <span class="table-page-search-submitButtons" style="float: right">
-            <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
-            <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default" @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
-            <a-button v-if="$auth('repair-application-forms-assign') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 16px" type="default" @click="handleAssign">派工</a-button>
-            <a-popconfirm v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" title="是否要接收?" @confirm="receive">
+            <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default"
+              @ok="handleOk" @click="handleViewBom()">备件BOM</a-button>
+            <a-button v-if="$auth('repair-application-forms-finish')" style="margin-left: 16px" type="default"
+              @ok="handleOk" @click="handleViewCheck()">维护项目</a-button>
+            <a-button
+              v-if="$auth('repair-application-forms-assign') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              style="margin-left: 16px" type="default" @click="handleAssign">派工</a-button>
+            <a-popconfirm
+              v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              title="是否要接收?" @confirm="receive">
               <a-button style="margin-left: 8px">接收</a-button>
             </a-popconfirm>
-            <a-button v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)" style="margin-left: 8px" @click="handleReject">拒单</a-button>
-            <a-button v-if="$auth('repair-application-forms-out') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status) && model.type != 2" style="margin-left: 8px" type="default" @click="handleOut">委外</a-button>
-            <a-button v-if="$auth('repair-application-forms-dispatch') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status" style="margin-left: 8px" type="default" @click="handleDispatch">转派</a-button>
-            <a-button v-if="$auth('repair-application-forms-transfer') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="default" @click="handleTransfer">转派</a-button>
-            <a-button v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status" style="margin-left: 8px" type="default" @click="handleFinish()">完成</a-button>
-            <a-button v-if="$auth('repair-application-forms-edit')" style="margin-left: 8px" type="default" @click="handleEdit()">修改</a-button>
-            <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.WAIT_SUBMIT === model.status" title="是否要提交审核该条数据?" @confirm="handleExamine">
+            <a-button
+              v-if="$auth('repair-application-forms-deal') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.NOT_ALLOCATED === model.status || DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status)"
+              style="margin-left: 8px" @click="handleReject">拒单</a-button>
+            <a-button
+              v-if="$auth('repair-application-forms-out') && (DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status) && model.type != 2"
+              style="margin-left: 8px" type="default" @click="handleOut">委外</a-button>
+            <a-button
+              v-if="$auth('repair-application-forms-dispatch') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.REBACK === model.status"
+              style="margin-left: 8px" type="default" @click="handleDispatch">转派</a-button>
+            <a-button
+              v-if="$auth('repair-application-forms-transfer') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status"
+              style="margin-left: 8px" type="default" @click="handleTransfer">转派</a-button>
+            <a-button
+              v-if="$auth('repair-application-forms-finish') && DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.PROCESSING === model.status"
+              style="margin-left: 8px" type="default" @click="handleFinish()">完成</a-button>
+            <!-- 隐藏查看工单中的修改按钮 -->
+            <!-- <a-button v-if="$auth('repair-application-forms-edit')" style="margin-left: 8px" type="default" @click="handleEdit()">修改</a-button> -->
+            <a-popconfirm v-if="DictCache.VALUE.REPAIR_APPLICATION_FORM_STATUS.WAIT_SUBMIT === model.status"
+              title="是否要提交审核该条数据?" @confirm="handleExamine">
               <a-button style="margin-left: 8px" type="default">提交审核</a-button>
             </a-popconfirm>
             <a-button style="margin-left: 8px" type="primary" @click="handleCancel">返回</a-button>
@@ -32,14 +50,15 @@
             <detail-list-item term="设备名称">{{ model.sbName }}</detail-list-item>
             <detail-list-item term="预留维修时间">{{ model.limitHours }}</detail-list-item>
             <detail-list-item term="使用位置">{{ model.sbCph }}</detail-list-item>
-            <detail-list-item term="工单类别">{{ BaseTool.Object.getField(planFlagMap,model.category) }}</detail-list-item>
+            <detail-list-item term="工单类别">{{ BaseTool.Object.getField(planFlagMap, model.category) }}</detail-list-item>
             <!--            <detail-list-item term="是否停机">{{ BaseTool.Object.getField(needStopMap,model.needStop) }}</detail-list-item>-->
             <detail-list-item term="报修人">{{ model.actualUser }}</detail-list-item>
             <!--            <detail-list-item term="报修来源">{{ BaseTool.Object.getField(this.sourceMap, model.source) }}</detail-list-item>
             <detail-list-item term="紧急等级"><badge :text="BaseTool.Object.getField(levelMap,model.level)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_LEVEL[model.applicationLevel]"/></detail-list-item>-->
             <detail-list-item term="报修时间">{{ model.applyTime }}</detail-list-item>
             <detail-list-item term="报修状态">
-              <badge :text="BaseTool.Object.getField(statusMap,model.status)" :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]" />
+              <badge :text="BaseTool.Object.getField(statusMap, model.status)"
+                :status="DictCache.COLOR.REPAIR_APPLICATION_FORM_STATUS[model.status]" />
             </detail-list-item>
             <detail-list-item term="要求时间">{{ model.limitHours }}小时</detail-list-item>
             <detail-list-item term="要求日期">{{ model.limitDate }}</detail-list-item>
@@ -55,7 +74,8 @@
                 <img v-for="item in model.applicationFileList" :src="item.url" :key="item.id" class="image">
               </viewer>
             </detail-list-item>
-            <detail-list-item term="" v-if="model.applicationFileList == null || model.applicationFileList.length === 0">
+            <detail-list-item term=""
+              v-if="model.applicationFileList == null || model.applicationFileList.length === 0">
               暂无
             </detail-list-item>
           </detail-list>
@@ -83,9 +103,10 @@
             </detail-list-item>
           </detail-list>
           <a-divider orientation="left">委外记录</a-divider>
-          <a-table :data-source="entrustList" :columns="columnsEntrust" tableLayout="auto" rowKey="id" v-if="entrustList.length > 0">
+          <a-table :data-source="entrustList" :columns="columnsEntrust" tableLayout="auto" rowKey="id"
+            v-if="entrustList.length > 0">
             <span slot="entrustStatus" slot-scope="text">
-              <badge :text="text === 1 ? '委外维修中' : '已完成'" :status="text === 1 ? 'processing' : 'success'"/>
+              <badge :text="text === 1 ? '委外维修中' : '已完成'" :status="text === 1 ? 'processing' : 'success'" />
             </span>
             <span slot="entrustOutType" slot-scope="text">
               {{ BaseTool.Object.getField(outTypeMap, text) }}
@@ -121,11 +142,11 @@
         <a-layout-sider style="background-color: rgb(255, 255, 255)">
           <div style="margin-top: 30px;margin-left: 30px;">
             <a-steps progress-dot :current="6" direction="vertical">
-              <a-step title="报修时间:" :description="''+model.applyTime?model.applyTime:''" />
-              <a-step title="维修开始时间:" :description="''+model.repairStartTime?model.repairStartTime:''" />
-              <a-step title="维修结束时间:" :description="''+model.repairEndTime?model.repairEndTime:''" />
-              <a-step title="审核开始时间:" :description="''+model.checkStartTime?model.checkStartTime:''" />
-              <a-step title="审核结束时间:" :description="''+model.checkEndTime?model.checkEndTime:''" />
+              <a-step title="报修时间:" :description="'' + model.applyTime ? model.applyTime : ''" />
+              <a-step title="维修开始时间:" :description="'' + model.repairStartTime ? model.repairStartTime : ''" />
+              <a-step title="维修结束时间:" :description="'' + model.repairEndTime ? model.repairEndTime : ''" />
+              <a-step title="审核开始时间:" :description="'' + model.checkStartTime ? model.checkStartTime : ''" />
+              <a-step title="审核结束时间:" :description="'' + model.checkEndTime ? model.checkEndTime : ''" />
             </a-steps>
           </div>
         </a-layout-sider>
@@ -148,36 +169,38 @@
                   <a>删除</a>
                 </a-popconfirm>
               </template>
-            </span>
-          </a-table>
-        </q-tab-pane>
-        <q-tab-pane key="2" tab="委外记录">
-          <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
-            <a-button type="primary" @click="handleAddFee">
-              <a-icon type="plus" />
-              添加
-            </a-button>
-          </div>
-          <a-table :data-source="dataFee" :columns="columnsFee" tableLayout="auto" rowKey="id">
-            <span slot="action" slot-scope="record">
-              <template>
+</span>
+</a-table>
+</q-tab-pane>
+<q-tab-pane key="2" tab="委外记录">
+  <div class="table-operator" v-if="$auth('repair-application-forms-finish')">
+    <a-button type="primary" @click="handleAddFee">
+      <a-icon type="plus" />
+      添加
+    </a-button>
+  </div>
+  <a-table :data-source="dataFee" :columns="columnsFee" tableLayout="auto" rowKey="id">
+    <span slot="action" slot-scope="record">
+      <template>
                 <a @click="handleViewFee(record)">查看</a>
                 <operation-button @click="handleEditFee(record)">修改</operation-button>
                 <operation-button title="确认删除该笔费用?" @confirm="batchDeleteFee(record.id)">删除</operation-button>
               </template>
-            </span>
-          </a-table>
-        </q-tab-pane>
-        <q-tab-pane key="3" tab="维修报告">
-          <div class="table-operator" v-if="$auth('repair-application-forms-finish') && ((dataReason === null) || (dataReason.length===0))">
-            <a-button type="primary" @click="handleAddReason">
-              <a-icon type="plus" />
-              添加
-            </a-button>
-          </div>
-          <a-table :data-source="dataReason" :columns="columnsReason" :scroll="{x: 1, y: BaseTool.Constant.scrollY }" rowKey="id">
-            <span slot="action" slot-scope="record">
-              <template>
+    </span>
+  </a-table>
+</q-tab-pane>
+<q-tab-pane key="3" tab="维修报告">
+  <div class="table-operator"
+    v-if="$auth('repair-application-forms-finish') && ((dataReason === null) || (dataReason.length===0))">
+    <a-button type="primary" @click="handleAddReason">
+      <a-icon type="plus" />
+      添加
+    </a-button>
+  </div>
+  <a-table :data-source="dataReason" :columns="columnsReason" :scroll="{x: 1, y: BaseTool.Constant.scrollY }"
+    rowKey="id">
+    <span slot="action" slot-scope="record">
+      <template>
                 <a @click="handleViewReason(record)">查看</a>
                 <operation-button @click="handleEditReason(record)">修改</operation-button>
                 <operation-button
@@ -185,11 +208,11 @@
                   @click="handleCopyReason(record)" >复制</operation-button>
                 <operation-button :type="2" title="确认删除该记录?" @confirm="batchDeleteReason(record.id)">删除</operation-button>
               </template>
-            </span>
-          </a-table>
-        </q-tab-pane>
-      </q-tabs>
-      -->
+    </span>
+  </a-table>
+</q-tab-pane>
+</q-tabs>
+-->
       <!--      <title-divider title="备件清单" width="90px"></title-divider>
 
       <title-divider title="费用清单" width="90px"></title-divider>
@@ -497,15 +520,15 @@ export default {
           ellipsis: true,
           width: '150px',
         },
-       /* {
-          title: '改进措施类别',
-          dataIndex: 'type',
-          ellipsis: true,
-          width: '150px',
-          customRender: (text, record, index) => {
-            return this.BaseTool.Object.getField(this.typeReasonMap, text)
-          },
-        },*/
+        /* {
+           title: '改进措施类别',
+           dataIndex: 'type',
+           ellipsis: true,
+           width: '150px',
+           customRender: (text, record, index) => {
+             return this.BaseTool.Object.getField(this.typeReasonMap, text)
+           },
+         },*/
         {
           title: '原因分析',
           dataIndex: 'reasonAnalysis',
@@ -918,14 +941,15 @@ export default {
   width: 300px;
   height: 300px;
 }
-.ant-carousel >>> .slick-slide {
+
+.ant-carousel>>>.slick-slide {
   text-align: center;
   height: 300px;
   line-height: 300px;
   overflow: hidden;
 }
 
-.ant-carousel >>> .slick-slide h3 {
+.ant-carousel>>>.slick-slide h3 {
   color: #fff;
 }
 

+ 95 - 141
src/views/sb/info/SbInfo.vue

@@ -18,31 +18,28 @@
               <a-row :gutter="48">
                 <a-col :md="6" :sm="24">
                   <a-form-item label="关键字">
-                    <a-input v-model="queryParam.keyword" placeholder="名称/设备新号"/>
+                    <a-input v-model="queryParam.keyword" placeholder="名称/设备新号" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="设备旧号">
-                    <a-input v-model="queryParam.zbh" placeholder="设备旧号"/>
+                    <a-input v-model="queryParam.zbh" placeholder="设备旧号" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="第一维修人">
-                    <a-input v-model="queryParam.repairUserName" placeholder="第一维修人"/>
+                    <a-input v-model="queryParam.repairUserName" placeholder="第一维修人" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="第二维修人">
-                    <a-input v-model="queryParam.repairUserSecondName" placeholder="第二维修人"/>
+                    <a-input v-model="queryParam.repairUserSecondName" placeholder="第二维修人" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="设备等级">
                     <a-select v-model="queryParam.level" placeholder="请选择">
-                      <a-select-option
-                        v-for="(label,value) in levelMap"
-                        :key="value"
-                        :label="label"
+                      <a-select-option v-for="(label, value) in levelMap" :key="value" :label="label"
                         :value="parseInt(value)">{{ label }}
                       </a-select-option>
                     </a-select>
@@ -51,10 +48,7 @@
                 <a-col :md="6" :sm="24">
                   <a-form-item label="自定义类型">
                     <a-select v-model="queryParam.useType" placeholder="请选择">
-                      <a-select-option
-                        v-for="(label,value) in useTypeMap"
-                        :key="value"
-                        :label="label"
+                      <a-select-option v-for="(label, value) in useTypeMap" :key="value" :label="label"
                         :value="parseInt(value)">{{ label }}
                       </a-select-option>
                     </a-select>
@@ -62,49 +56,37 @@
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="规格型号">
-                    <a-input v-model="queryParam.model" placeholder="规格型号"/>
+                    <a-input v-model="queryParam.model" placeholder="规格型号" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="所属车间">
                     <a-select v-model="queryParam.positionId" placeholder="请选择">
-                      <a-select-option
-                        v-for="({id,name}) in sbPositionData"
-                        :key="id"
-                        :label="name"
-                        :value="id">{{ name }}
+                      <a-select-option v-for="({ id, name }) in sbPositionData" :key="id" :label="name" :value="id">{{ name
+                        }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="生产商">
-                    <a-input v-model="queryParam.producerName" placeholder="生产商名称"/>
+                    <a-input v-model="queryParam.producerName" placeholder="生产商名称" />
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="设备类型">
-                    <a-tree-select
-                      style="width: 100%"
-                      :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-                      :treeData="treeData"
-                      :treeNodeFilterProp="'title'"
-                      :showSearch="true"
-                      v-model="queryParam.typeId"
-                      placeholder="请选择"
-                    >
+                    <a-tree-select style="width: 100%" :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                      :treeData="treeData" :treeNodeFilterProp="'title'" :showSearch="true" v-model="queryParam.typeId"
+                      placeholder="请选择">
                     </a-tree-select>
                   </a-form-item>
                 </a-col>
                 <a-col :md="6" :sm="24">
                   <a-form-item label="设备状态">
                     <a-select v-model="queryParam.status" placeholder="请选择">
-                      <a-select-option
-                        v-for="(label,value) in statusMap"
-                        :key="value"
-                        :defaultValue="DictCache.VALUE.SB_INFO_STATUS.IN_USE"
-                        :label="label"
-                        :value="parseInt(value)">{{ label }}
+                      <a-select-option v-for="(label, value) in statusMap" :key="value"
+                        :defaultValue="DictCache.VALUE.SB_INFO_STATUS.IN_USE" :label="label" :value="parseInt(value)">{{
+                        label }}
                       </a-select-option>
                     </a-select>
                   </a-form-item>
@@ -130,21 +112,26 @@
 
           <div class="table-operator">
             <a-button v-if="$auth('sb-infos-add')" type="primary" icon="plus" @click="handleAdd">新增</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExport">导出</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExportFee()">费用导出</a-button>
+            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download"
+              @click="doExport">导出</a-button>
+            <!-- 隐藏费用导出按钮 -->
+            <!-- <a-button style="margin-left: 8px" v-if="$auth('sb-infos-export')" type="primary" icon="download" @click="doExportFee()">费用导出</a-button> -->
 
             <a-button style="margin-left:8px;" type="primary" @click="doImport">
-              <a-icon type="upload"/>
+              <a-icon type="upload" />
               新增导入
             </a-button>
             <a-button style="margin-left:8px;" type="primary" @click="doImportForUpdate">
-              <a-icon type="upload"/>
+              <a-icon type="upload" />
               修改导入
             </a-button>
-            <a-button style="margin-left:8px;" type="primary" icon="download" @click="doDownloadImportTemplate">导入模板下载</a-button>
+            <a-button style="margin-left:8px;" type="primary" icon="download"
+              @click="doDownloadImportTemplate">导入模板下载</a-button>
             <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrintBatch()">批量打印</a-button>
-            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-generate-code-all')" :loading="confirmLoading" type="primary" @click="batchGenerate()">重新生成二维码</a-button>
-            <a-button style="margin-left: 8px" type="primary" icon="environment" @click="handleInitPoints">初始化打点</a-button>
+            <a-button style="margin-left: 8px" v-if="$auth('sb-infos-generate-code-all')" :loading="confirmLoading"
+              type="primary" @click="batchGenerate()">重新生成二维码</a-button>
+            <a-button style="margin-left: 8px" type="primary" icon="environment"
+              @click="handleInitPoints">初始化打点</a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('sb-infos-del')">
               <a-menu slot="overlay">
                 <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
@@ -157,18 +144,9 @@
             </a-dropdown>
           </div>
 
-          <s-table
-            ref="table"
-            size="default"
-            rowKey="id"
-            :widthSpace="true"
-            :columns="columns"
-            :data="loadData"
-            :alert="options.alert"
-            :rowSelection="options.rowSelection"
-            :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
-            showPagination="auto"
-          >
+          <s-table ref="table" size="default" rowKey="id" :widthSpace="true" :columns="columns" :data="loadData"
+            :alert="options.alert" :rowSelection="options.rowSelection"
+            :scroll="{ x: 1500, y: BaseTool.Constant.scrollY }" showPagination="auto">
             <span slot="action" slot-scope="record">
               <template>
                 <div>
@@ -209,56 +187,52 @@
               </template>
             </span>
             <span slot="status" slot-scope="text">
-              <badge
-                :status="DictCache.COLOR.SB_INFO_STATUS[text]"
-                :text="statusMap[text]" />
+              <badge :status="DictCache.COLOR.SB_INFO_STATUS[text]" :text="statusMap[text]" />
             </span>
           </s-table>
         </div>
       </a-col>
     </a-row>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <base-form-status-log ref="baseModalStatusLog" @ok="handleOk"/>
-    <detail ref="detailModal" @ok="handleOk"/>
-    <download-modal ref="downloadModal"/>
-    <preview-modal ref="previewModal"/>
-    <import-form-add ref="importModal" @ok="handleOk"/>
-    <import-form-update ref="importModalUpdate" @ok="handleOk"/>
-    <print-sb-code ref="printSbCode"/>
-    <print-in-sb-info-batch ref="printInSbInfoBatch" @ok="handleOk"/>
+    <base-form ref="baseModal" @ok="handleOk" />
+    <base-form-status-log ref="baseModalStatusLog" @ok="handleOk" />
+    <detail ref="detailModal" @ok="handleOk" />
+    <download-modal ref="downloadModal" />
+    <preview-modal ref="previewModal" />
+    <import-form-add ref="importModal" @ok="handleOk" />
+    <import-form-update ref="importModalUpdate" @ok="handleOk" />
+    <print-sb-code ref="printSbCode" />
+    <print-in-sb-info-batch ref="printInSbInfoBatch" @ok="handleOk" />
 
     <!-- 初始化打点弹窗 -->
-    <a-modal
-      title="初始化打点"
-      :visible="initPointsVisible"
-      :confirmLoading="initPointsLoading"
-      @ok="doInitPoints"
-      @cancel="initPointsVisible = false"
-      width="600px"
-    >
+    <a-modal title="初始化打点" :visible="initPointsVisible" :confirmLoading="initPointsLoading" @ok="doInitPoints"
+      @cancel="initPointsVisible = false" width="600px">
       <a-form :form="initPointsForm" :label-col="{ span: 8 }" :wrapper-col="{ span: 14 }">
         <a-divider orientation="left">矩形坐标(左上、右下)</a-divider>
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="左上经度">
-              <a-input-number v-model="initPointsData.points[0].longitude" :step="0.000001" style="width: 100%" placeholder="经度"/>
+              <a-input-number v-model="initPointsData.points[0].longitude" :step="0.000001" style="width: 100%"
+                placeholder="经度" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="左上纬度">
-              <a-input-number v-model="initPointsData.points[0].latitude" :step="0.000001" style="width: 100%" placeholder="纬度"/>
+              <a-input-number v-model="initPointsData.points[0].latitude" :step="0.000001" style="width: 100%"
+                placeholder="纬度" />
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="16">
           <a-col :span="12">
             <a-form-item label="右下经度">
-              <a-input-number v-model="initPointsData.points[1].longitude" :step="0.000001" style="width: 100%" placeholder="经度"/>
+              <a-input-number v-model="initPointsData.points[1].longitude" :step="0.000001" style="width: 100%"
+                placeholder="经度" />
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="右下纬度">
-              <a-input-number v-model="initPointsData.points[1].latitude" :step="0.000001" style="width: 100%" placeholder="纬度"/>
+              <a-input-number v-model="initPointsData.points[1].latitude" :step="0.000001" style="width: 100%"
+                placeholder="纬度" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -269,44 +243,24 @@
         </a-row>
         <a-divider orientation="left">选择设备位置</a-divider>
         <a-form-item label="设备位置" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
-          <a-select
-            v-model="initPointsData.positionIds"
-            mode="multiple"
-            show-search
-            :filter-option="filterPositionOption"
-            option-filter-prop="children"
-            placeholder="请选择设备位置"
-            style="width: 100%"
-          >
-            <a-select-option
-              v-for="item in sbPositionData"
-              :key="item.id"
-              :value="item.id"
-            >{{ item.name }}</a-select-option>
+          <a-select v-model="initPointsData.positionIds" mode="multiple" show-search
+            :filter-option="filterPositionOption" option-filter-prop="children" placeholder="请选择设备位置"
+            style="width: 100%">
+            <a-select-option v-for="item in sbPositionData" :key="item.id" :value="item.id">{{ item.name
+              }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-divider orientation="left">底图与显示</a-divider>
         <a-form-item label="选择底图" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
-          <a-select
-            v-model="initPointsData.mapName"
-            placeholder="请选择底图"
-            style="width: 100%"
-          >
-            <a-select-option
-              v-for="item in mapNameList"
-              :key="item.targetId"
-              :value="item.targetId"
-            >{{ item.targetId }}</a-select-option>
+          <a-select v-model="initPointsData.mapName" placeholder="请选择底图" style="width: 100%">
+            <a-select-option v-for="item in mapNameList" :key="item.targetId" :value="item.targetId">{{ item.targetId
+              }}</a-select-option>
           </a-select>
         </a-form-item>
         <a-form-item label="是否显示" :label-col="{ span: 4 }" :wrapper-col="{ span: 18 }">
           <a-select v-model="initPointsData.isShow" placeholder="请选择">
-            <a-select-option
-              v-for="(label, value) in isShowMap"
-              :key="value"
-              :label="label"
-              :value="parseInt(value)"
-            >{{ label }}</a-select-option>
+            <a-select-option v-for="(label, value) in isShowMap" :key="value" :label="label" :value="parseInt(value)">{{
+              label }}</a-select-option>
           </a-select>
         </a-form-item>
       </a-form>
@@ -363,7 +317,7 @@ export default {
       default: null
     }
   },
-  data () {
+  data() {
     return {
       // 查询参数
       queryParam: {
@@ -637,7 +591,7 @@ export default {
       optionAlertShow: false
     }
   },
-  created () {
+  created() {
     this.tableOption()
     this.depreciationTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_DEPRECIATIONTYPE)
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
@@ -655,7 +609,7 @@ export default {
     })
   },
   methods: {
-    tableOption () {
+    tableOption() {
       this.setTree()
       if (!this.optionAlertShow) {
         this.options = {
@@ -680,7 +634,7 @@ export default {
         this.optionAlertShow = false
       }
     },
-    batchDelete (id) {
+    batchDelete(id) {
       let ids = []
       if (this.BaseTool.String.isBlank(id)) {
         const length = this.selectedRows.length
@@ -698,7 +652,7 @@ export default {
         this.$refs.table.clearSelected()
       })
     },
-    batchGenerate () {
+    batchGenerate() {
       this.confirmLoading = true
       this.$message.info('正在生成请稍后')
       generateSbCodeAll().then(res => {
@@ -708,21 +662,21 @@ export default {
         this.$refs.table.clearSelected()
       })
     },
-    handleEdit (record) {
+    handleEdit(record) {
       fetchSbInfo({ id: record.id }).then(res => {
         this.visible = false
         const modal = this.$refs.baseModal
         modal.base(res.data)
       })
     },
-    handlePrint (record) {
+    handlePrint(record) {
       this.visible = false
       fetchSbInfo({ id: record.id }).then(res => {
         const modal = this.$refs.printInSbInfoBatch
         modal.base([res.data])
       })
     },
-    handlePrintBatch () {
+    handlePrintBatch() {
       this.visible = false
       let ids = []
       const length = this.selectedRows.length
@@ -736,7 +690,7 @@ export default {
         modal.base(res.data)
       })
     },
-    handleStart (record) {
+    handleStart(record) {
       const modal = this.$refs.baseModalStatusLog
       modal.base(null, {
         sbId: record.id,
@@ -747,7 +701,7 @@ export default {
         afterStatus: this.DictCache.VALUE.SB_INFO_STATUS.IN_USE
       })
     },
-    handleStop (record) {
+    handleStop(record) {
       const modal = this.$refs.baseModalStatusLog
       modal.base(null, {
         sbId: record.id,
@@ -758,11 +712,11 @@ export default {
         afterStatus: this.DictCache.VALUE.SB_INFO_STATUS.IN_STOP
       })
     },
-    handleAdd () {
+    handleAdd() {
       this.visible = false
       this.$refs.baseModal.base()
     },
-    handleView (record) {
+    handleView(record) {
       fetchSbInfo({ id: record.id }).then(res => {
         this.visible = false
         const modal = this.$refs.detailModal
@@ -770,23 +724,23 @@ export default {
       })
     },
 
-    handleCopy (record) {
+    handleCopy(record) {
       this.visible = false
       fetchSbInfo({ id: record.id }).then(res => {
         const modal = this.$refs.baseModal
         modal.base(res.data, 1)
       })
     },
-    handleOk () {
+    handleOk() {
       this.visible = true
       this.setTree()
       this.$refs.table.refresh()
     },
-    onSelectChange (selectedRowKeys, selectedRows) {
+    onSelectChange(selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
-    resetSearchForm () {
+    resetSearchForm() {
       this.queryParam = {
         filter: this.filter,
         useType: this.useType
@@ -794,7 +748,7 @@ export default {
       this.visible = true
       this.$refs.table.refresh(true)
     },
-    doExport () {
+    doExport() {
       const parameter = {
         ...this.queryParam,
         dataScope: {
@@ -806,7 +760,7 @@ export default {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
-    doExportFee (id) {
+    doExportFee(id) {
       let ids = []
       if (this.BaseTool.String.isBlank(id)) {
         const length = this.selectedRows.length
@@ -824,7 +778,7 @@ export default {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
-    setTree (record = {}) {
+    setTree(record = {}) {
       queryDept({ nature: this.DictCache.VALUE.SYS_DEPT_NATURE.JITUAN }).then(res => {
         this.areaList = res.data
       })
@@ -837,44 +791,44 @@ export default {
       this.queryParam.typeId = selectedKeys.length > 0 ? selectedKeys[0] : ''
       this.$refs.table.refresh(true)
     },
-    onExpand (expandedKeys) {
+    onExpand(expandedKeys) {
       this.expandedKeys = expandedKeys
       this.autoExpandParent = false
     },
-    handleRepairFilePreview (record) {
+    handleRepairFilePreview(record) {
       console.log(record, 87878)
       this.$refs.previewModal.base(record.id, this.DictCache.VALUE.FILE_MODULE.SBINFO_REPAIRFILE)
     },
-    handleRepairFileDownload (record) {
+    handleRepairFileDownload(record) {
       // this.$refs.downloadModal.base(record.id, this.DictCache.VALUE.FILE_MODULE.SBINFO_REPAIRFILE, getDownloadUrl(record.id))
     },
-    handleUseFilePreview (record) {
+    handleUseFilePreview(record) {
       this.$refs.previewModal.base(record.id, this.DictCache.VALUE.FILE_MODULE.SBINFO_USEFILE)
     },
-    handleUseFileDownload (record) {
+    handleUseFileDownload(record) {
       // this.$refs.downloadModal.base(record.id, this.DictCache.VALUE.FILE_MODULE.SBINFO_USEFILE, getDownloadUrl(record.id))
     },
-    handleCheckFilePreview (record) {
+    handleCheckFilePreview(record) {
       this.$refs.previewModal.base(record.id, this.DictCache.VALUE.FILE_MODULE.SBINFO_RECHECKFILE)
     },
-    handleCheckFileDownload (record) {
+    handleCheckFileDownload(record) {
       // this.$refs.downloadModal.base(record.id, this.DictCache.VALUE.FILE_MODULE.SBINFO_RECHECKFILE, getDownloadUrl(record.id))
     },
-    doImport () {
+    doImport() {
       this.$refs.importModal.base(null, null)
     },
-    doImportForUpdate () {
+    doImportForUpdate() {
       this.$refs.importModalUpdate.base(null, null)
     },
-    doDownloadImportTemplate () {
+    doDownloadImportTemplate() {
       downloadSbInfoImportTemplate().then(file => {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
-    filterPositionOption (input, option) {
+    filterPositionOption(input, option) {
       return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
     },
-    handleInitPoints () {
+    handleInitPoints() {
       this.initPointsData = {
         points: [
           { longitude: undefined, latitude: undefined },
@@ -886,7 +840,7 @@ export default {
       }
       this.initPointsVisible = true
     },
-    doInitPoints () {
+    doInitPoints() {
       // 校验坐标是否填写完整
       const validPoints = this.initPointsData.points.every(
         p => p.longitude !== undefined && p.longitude !== null && p.latitude !== undefined && p.latitude !== null
@@ -914,11 +868,11 @@ export default {
         this.initPointsLoading = false
       })
     },
-    openMapSelector () {
+    openMapSelector() {
       // 打开地图选点组件,传入当前选择的底图
       this.$refs.initPointMapSelect.base(this.initPointsData.mapName)
     },
-    handleMapPointSelected (data) {
+    handleMapPointSelected(data) {
       // 地图选点回调,data 包含 x1, y1, x2, y2 (小数形式 0-1)
       // 转换为实际坐标值(这里假设地图坐标范围是 0-1,直接存储)
       // 如果需要转换为实际经纬度,需要根据底图的坐标范围进行转换

+ 40 - 60
src/views/sqarepartmanage/sparepartinfo/SpareStoreTotal.vue

@@ -5,55 +5,46 @@
         <a-row :gutter="48">
           <a-col :md="8" :sm="24">
             <a-form-item label="关键字">
-              <a-input v-model="queryParam.keyword" placeholder="请输入名称/编码"/>
+              <a-input v-model="queryParam.keyword" placeholder="请输入名称/编码" />
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="品牌">
-              <a-input v-model="queryParam.brand" placeholder="模糊查询"/>
+              <a-input v-model="queryParam.brand" placeholder="模糊查询" />
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="类型">
-              <a-tree-select
-                style="width: 100%"
-                :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
-                :treeData="spareTypeTreeData"
-                :treeNodeFilterProp="'title'"
-                :showSearch="true"
-                v-model="queryParam.typeId"
-                placeholder="请选择"
-              >
+              <a-tree-select style="width: 100%" :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+                :treeData="spareTypeTreeData" :treeNodeFilterProp="'title'" :showSearch="true"
+                v-model="queryParam.typeId" placeholder="请选择">
               </a-tree-select>
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="规格型号">
-              <a-input v-model="queryParam.ggxh" placeholder="模糊查询"/>
+              <a-input v-model="queryParam.ggxh" placeholder="模糊查询" />
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="原厂编号">
-              <a-input v-model="queryParam.initNo" placeholder="模糊查询"/>
+              <a-input v-model="queryParam.initNo" placeholder="模糊查询" />
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="生产商">
-              <a-input v-model="queryParam.producerName" placeholder="名称模糊查询"/>
+              <a-input v-model="queryParam.producerName" placeholder="名称模糊查询" />
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="供应商">
-              <a-input v-model="queryParam.supplierName" placeholder="名称模糊查询"/>
+              <a-input v-model="queryParam.supplierName" placeholder="名称模糊查询" />
             </a-form-item>
           </a-col>
           <a-col :md="8" :sm="24">
             <a-form-item label="等级">
               <a-select v-model="queryParam.level" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in levelMap"
-                  :key="value"
-                  :label="label"
+                <a-select-option v-for="(label, value) in levelMap" :key="value" :label="label"
                   :value="parseInt(value)">{{ label }}
                 </a-select-option>
               </a-select>
@@ -62,16 +53,13 @@
           <a-col :md="6" :sm="24">
             <a-form-item label="用途">
               <a-select v-model="queryParam.yt" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in ytMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
+                <a-select-option v-for="(label, value) in ytMap" :key="value" :label="label" :value="parseInt(value)">{{
+                  label }}
                 </a-select-option>
               </a-select>
             </a-form-item>
           </a-col>
-<!--          <a-col :md="6" :sm="24">
+          <!--          <a-col :md="6" :sm="24">
             <a-form-item label="是否专用">
               <a-select v-model="queryParam.isSpecial" placeholder="请选择">
                 <a-select-option
@@ -83,7 +71,7 @@
               </a-select>
             </a-form-item>
           </a-col>-->
-<!--          <a-col :md="6" :sm="24">
+          <!--          <a-col :md="6" :sm="24">
             <a-form-item label="关联设备">
               <a-input v-model="queryParam.model" placeholder="新号/旧号/名称/规格"/>
             </a-form-item>
@@ -101,39 +89,29 @@
 
     <div class="table-operator">
       <!--<a-button v-if="$auth('store-spare-stores-add')" type="primary" icon="plus" @click="$refs.baseModal.base()">新增</a-button>-->
-      <a-button style="margin-left: 8px" v-if="$auth('store-spare-stores-export')" type="primary" icon="download" @click="doExport">导出</a-button>
+      <a-button style="margin-left: 8px" v-if="$auth('store-spare-stores-export')" type="primary" icon="download"
+        @click="doExport">导出</a-button>
     </div>
 
-    <s-table
-      ref="table"
-      size="default"
-      rowKey="id"
-      :columns="columns"
-      :data="loadData"
-      :alert="options.alert"
-      :scroll="{x: 1500, y: BaseTool.Constant.scrollY}"
-      :rowSelection="options.rowSelection"
-      showPagination="auto"
-    >
+    <s-table ref="table" size="default" rowKey="id" :columns="columns" :data="loadData" :alert="options.alert"
+      :scroll="{ x: 1500, y: BaseTool.Constant.scrollY }" :rowSelection="options.rowSelection" showPagination="auto">
       <span slot="action" slot-scope="record">
         <template>
           <a v-if="record.warnStatus != 1" @click="handleUpdateStatus(record, 1)">待处理</a>
           <a-divider type="vertical" />
           <a v-if="record.warnStatus != 2" @click="handleUpdateStatus(record, 2)">询价中</a>
           <a-divider type="vertical" />
-          <a v-if="record.warnStatus != 3"@click="handleUpdateStatus(record, 3)">采购中</a>
+          <a v-if="record.warnStatus != 3" @click="handleUpdateStatus(record, 3)">采购中</a>
           <a-divider type="vertical" />
           <a v-if="record.warnStatus != 0" @click="handleUpdateStatus(record, 0)">正常</a>
         </template>
       </span>
       <span slot="status" slot-scope="text">
-        <badge
-          :status="DictCache.COLOR.SPARE_WARN_STATUS[text]"
-          :text="warnStatusMap[text]" />
+        <badge :status="DictCache.COLOR.SPARE_WARN_STATUS[text]" :text="warnStatusMap[text]" />
       </span>
     </s-table>
-    <base-form ref="baseModal" @ok="handleOk"/>
-    <detail ref="detailModal"/>
+    <base-form ref="baseModal" @ok="handleOk" />
+    <detail ref="detailModal" />
   </a-card>
 </template>
 
@@ -167,7 +145,7 @@ export default {
       default: null
     }
   },
-  data () {
+  data() {
     return {
       companyList: {},
       projectList: {},
@@ -234,6 +212,7 @@ export default {
             }
           }
         },
+        /* 隐藏保养预耗库存列
         {
           title: '保养预耗库存',
           width: '120px',
@@ -249,6 +228,7 @@ export default {
             }
           }
         },
+        */
         {
           title: '最低库存',
           align: 'center',
@@ -338,12 +318,12 @@ export default {
             return this.BaseTool.Object.getField(this.ytMap, text)
           }
         },
-       /* {
-          title: '关联设备号',
-          checked: true,
-          width: '150px',
-          dataIndex: 'sbNo'
-        },*/
+        /* {
+           title: '关联设备号',
+           checked: true,
+           width: '150px',
+           dataIndex: 'sbNo'
+         },*/
         {
           title: '备注',
           checked: true,
@@ -397,7 +377,7 @@ export default {
       optionAlertShow: false
     }
   },
-  created () {
+  created() {
     // 下拉框map
     this.warnStatusMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_WARN_STATUS)
     this.ytMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_USE_TYPE)
@@ -412,12 +392,12 @@ export default {
     })
   },
   methods: {
-    handleCompanyChange (value) {
+    handleCompanyChange(value) {
       getDeptsAllByParentId({ deptId: value, nature: this.DictCache.VALUE.SYS_DEPT_NATURE.XIANG_MU_BU }).then(res => {
         this.projectList = res.data
       })
     },
-    tableOption () {
+    tableOption() {
       if (!this.optionAlertShow) {
         this.options = {
           alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
@@ -441,7 +421,7 @@ export default {
         this.optionAlertShow = false
       }
     },
-    handleUpdateStatus (record, warnStatus) {
+    handleUpdateStatus(record, warnStatus) {
       const parameter = {}
       parameter.id = record.id
       parameter.warnStatus = warnStatus
@@ -453,14 +433,14 @@ export default {
           this.confirmLoading = false
         })
     },
-    handleOk () {
+    handleOk() {
       this.$refs.table.refresh()
     },
-    onSelectChange (selectedRowKeys, selectedRows) {
+    onSelectChange(selectedRowKeys, selectedRows) {
       this.selectedRowKeys = selectedRowKeys
       this.selectedRows = selectedRows
     },
-    resetSearchForm () {
+    resetSearchForm() {
       this.queryParam = {
         filter: this.filter,
         warnStatusList: this.warnStatusList,
@@ -468,7 +448,7 @@ export default {
       }
       this.$refs.table.refresh(true)
     },
-    doExport () {
+    doExport() {
       const parameter = {
         ...this.queryParam
       }
@@ -476,7 +456,7 @@ export default {
         this.BaseTool.UPLOAD.downLoadExportExcel(file)
       })
     },
-    handleEnter () {
+    handleEnter() {
       this.$refs.table.refresh(true)
     }
   }