完善

src/views/dashboard/CheckJobReport.vue

@@ -4,40 +4,37 @@
       <div class="salesCard">
         <a-tabs default-active-key="1" size="large" :tab-bar-style="{marginBottom: '24px', paddingLeft: '16px'}">
           <div class="extra-wrapper" slot="tabBarExtraContent">
-            <a-month-picker
-              style="margin-left: 8px"
-              :default-value="moment(defaultStartMonth, monthFormat)"
-              :format="monthFormat"
-              v-model="queryParam.startMonth"
-              placeholder="开始月份"
-              @change="onStartChange" />
-            <a-month-picker
-              style="margin-left: 8px"
-              :default-value="moment(defaultEndMonth, monthFormat)"
-              :format="monthFormat"
-              v-model="queryParam.endMonth"
-              placeholder="结束月份"
-              @change="onEndChange" />
-            <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
-            <a-button style="margin-left: 8px" type="primary" icon="printer" @click="handlePrint()">打印</a-button>
-            <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="设备类型">
+            <a-row>
+              <a-col :md="3" :sm="24">
+                <a-month-picker
+                  style="margin-left: 8px"
+                  :default-value="moment(defaultStartMonth, monthFormat)"
+                  :format="monthFormat"
+                  v-model="queryParam.startMonth"
+                  placeholder="开始月份"
+                  @change="onStartChange" /></a-col>
+              <a-col :md="3" :sm="24">
+                <a-month-picker
+                  style="margin-left: 8px"
+                  :default-value="moment(defaultEndMonth, monthFormat)"
+                  :format="monthFormat"
+                  v-model="queryParam.endMonth"
+                  placeholder="结束月份"
+                  @change="onEndChange" /></a-col>
+              <a-col :md="3" :sm="24">
                 <a-tree-select
-                  style="width: 100%"
+                  style="width: 100%;margin-left: 8px;"
                   :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
                   :treeData="treeData"
                   :treeNodeFilterProp="'title'"
                   :showSearch="true"
                   v-model="queryParam.typeId"
-                  placeholder="请选择"
+                  placeholder="设备类型"
                 >
                 </a-tree-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-form-item label="设备等级">
-                <a-select v-model="queryParam.sbLevel" placeholder="请选择">
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-select style="margin-left: 8px" v-model="queryParam.sbLevel" placeholder="设备等级">
                   <a-select-option
                     v-for="(label,value) in sbLevelMap"
                     :key="value"
@@ -45,18 +42,27 @@
                     :value="parseInt(value)">{{ label }}
                   </a-select-option>
                 </a-select>
-              </a-form-item>
-            </a-col>
-            <a-col :md="6" :sm="24">
-              <a-select style="margin-left: 8px" @change="changeLevel" v-model="queryParam.standardLevel" placeholder="请选择">
-                <a-select-option
-                  v-for="(label,value) in levelMap"
-                  :key="value"
-                  :label="label"
-                  :value="parseInt(value)">{{ label }}
-                </a-select-option>
-              </a-select>
-            </a-col>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-select style="margin-left: 8px" @change="changeLevel" v-model="queryParam.standardLevel" placeholder="保养等级">
+                  <a-select-option
+                    v-for="(label,value) in levelMap"
+                    :key="value"
+                    :label="label"
+                    :value="parseInt(value)">{{ label }}
+                  </a-select-option>
+                </a-select>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="default" @click="getData()">查询</a-button>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="primary" @click="handlePrint()">打印</a-button>
+              </a-col>
+              <a-col :md="2" :sm="24">
+                <a-button style="margin-left: 8px" type="primary" @click="doExport()">导出</a-button>
+              </a-col>
+            </a-row>
           </div>
           <a-tab-pane loading="true" tab="图形统计" key="1">
             <a-row>
@@ -132,7 +138,8 @@ export default {
         // year: 2021,
         startMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-01-01',
         endMonth: this.BaseTool.Moment().format(this.BaseTool.Date.PICKER_NORM_YEAR) + '-12-01',
-        standardLevel: 2
+        standardLevel: 2,
+        sbLevel: 1
       },
       years: [],
       levelMap: {},
@@ -178,6 +185,7 @@ export default {
   },
   created () {
     this.levelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_LEVEL)
+    this.sbLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
     fetchSbTypeTree().then(res => {
       this.treeData = res.data
     })

src/views/repair/fee/RepairFee.vue

@@ -113,6 +113,7 @@ import { STable, Ellipsis } from '@/components'
 import BaseForm from './modules/BaseForm'
 import Detail from './modules/Detail'
 import { getRepairFeePage, deleteRepairFees, fetchRepairFee, exportRepairFee } from '@/api/repair/fee'
+import { fetchSbTypeTree } from '@/api/sb/type'
 
 export default {
   name: 'RepairFeeList',
@@ -129,6 +130,7 @@ export default {
       },
       moneyTypeMap: {},
       categoryMap: {},
+      sbLevelMap: {},
       // 表头
       columns: [
         {
@@ -139,12 +141,43 @@ export default {
           }
         },
         {
-          title: '维修单id',
+          title: '设备编号',
+          width: '100px',
+          dataIndex: 'sbNo'
+        },
+        {
+          title: '设备名称',
+          width: '150px',
+          dataIndex: 'sbName'
+        },
+        {
+          title: '设备类型',
+          width: '150px',
+          dataIndex: 'sbTypeName'
+        },
+        {
+          title: '设备等级',
+          width: '150px',
+          dataIndex: 'sbLevel',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.sbLevelMap, text)
+          }
+        },
+        {
+          title: '维修单号',
           dataIndex: 'repairId',
           customRender: (text, record, index) => {
             return record.repairNo
           }
         },
+        {
+          title: '维修单类型',
+          width: '150px',
+          dataIndex: 'category',
+          customRender: (text, record, index) => {
+            return this.BaseTool.Object.getField(this.categoryMap, text)
+          }
+        },
         {
           title: '委外单号',
           dataIndex: 'no'
@@ -217,7 +250,7 @@ export default {
       },
       selectedRowKeys: [],
       selectedRows: [],
-
+      treeData: [],
       options: {
         alert: { show: true, clear: () => { this.selectedRowKeys = [] } },
         rowSelection: {
@@ -232,6 +265,11 @@ export default {
     // 下拉框map
     this.typeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_FEE_TYPE)
     this.moneyTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.MONEY_TYPE)
+    this.sbLevelMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_LEVEL)
+    fetchSbTypeTree().then(res => {
+      this.treeData = res.data
+    })
+    this.categoryMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.REPAIR_APPLICATION_FORM_CATEGORY)
     this.tableOption()
   },
   methods: {

src/views/sb/info/modules/Detail.vue

@@ -20,7 +20,7 @@
               <a-button style="margin-left: 8px" type="default" @click="handleViewCheckJob()">保养任务</a-button>
             </a-badge>
             <a-button v-show="model.useType==4" style="margin-left: 8px" type="default" @click="handleMeasure()">检定记录</a-button>
-            <a-button v-if="$auth('check-polling-jobs-tui-calendar-first')" style="margin-left: 8px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
+            <a-button style="margin-left: 8px" type="error" @click="handleTuiCalendar(1)">保养日历</a-button>
             <a-button style="margin-left: 8px" type="default" @click="handleRepairReportSbInfo()">工单分析</a-button>
             <a-button style="margin-left: 8px" type="default" @click="handleRepairReportSbInfoFee()">费用分析</a-button>
             <a-button style="margin-left: 8px" type="primary" @click="handleCancel()">返回</a-button>
@@ -472,7 +472,7 @@ export default {
     },
     handleTuiCalendar (level) {
       const that = this
-      queryTuiCalendarIgnores({ sbId: this.model.id, type: 2, standardLevel: level }).then(res => {
+      queryTuiCalendarIgnores({ sbId: this.model.id, type: 2 }).then(res => {
         const a = document.createElement('a')
         a.target = '_blank'
         a.href = '/tui-calendar/checkJobCalendar.html?'

src/views/sqarepartmanage/sparepartinfo/modules/BaseForm.vue

@@ -634,6 +634,7 @@ export default {
           'ggxh',
           'yt',
           'zjm',
+          'isSpecial',
           'zbh',
           'agePeriod',
           'usePeriod',

src/views/sqarepartmanage/sparepartinfo/modules/Detail.vue

@@ -38,6 +38,7 @@
       <detail-list-item term="助记码">{{ model.zjm }}</detail-list-item>
       <detail-list-item term="产地">{{ BaseTool.Object.getField(cdMap,model.cd) }}</detail-list-item>
       <detail-list-item term="用途">{{ BaseTool.Object.getField(ytMap,model.yt) }}</detail-list-item>
+      <detail-list-item term="用途">{{ BaseTool.Object.getField(specialMap,model.isSpecial) }}</detail-list-item>
       <detail-list-item term="参数">{{ model.params }}</detail-list-item>
       <detail-list-item term="备注">{{ model.remark }}</detail-list-item>
       <detail-list-item term="创建人">{{ model.createdUserName }}</detail-list-item>
@@ -86,6 +87,7 @@ export default {
       unitMap: {},
       cdMap: {},
       ytMap: {},
+      specialMap: {},
       model: {
         'no': null,
         'name': null,
@@ -167,6 +169,7 @@ export default {
     this.unitMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SBINFO_UNIT)
     this.cdMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.PRODUCER_AREA)
     this.ytMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.SPARE_USE_TYPE)
+    this.specialMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.YES_NO)
     this.periodTypeMap = this.DictCache.getLabelByValueMapByType(this.DictCache.TYPE.CHECK_PLAN_PERIOD_TYPE)
   },
   methods: {