Merge remote-tracking branch 'origin/master'

src/views/module_base/energyRate/EnergyRateList.vue

@@ -79,18 +79,18 @@
       >
 
         <!-- 内嵌table区域 begin -->
-        <template slot="expandedRowRender" slot-scope="record">
+        <!-- <template slot="expandedRowRender" slot-scope="record">
           <a-tabs tabPosition="top">
             <a-tab-pane tab="详情" key="baseEnergyRateDetail" forceRender>
               <energy-rate-detail-sub-table :record="record"/>
             </a-tab-pane>
           </a-tabs>
-        </template>
+        </template> -->
         <!-- 内嵌table区域 end -->
 
-        <template slot="htmlSlot" slot-scope="text">
+        <!-- <template slot="htmlSlot" slot-scope="text">
           <div v-html="text"></div>
-        </template>
+        </template> -->
 
         <template slot="imgSlot" slot-scope="text,record">
           <div style="font-size: 12px;font-style: italic;">
@@ -136,6 +136,8 @@
 
     <!-- 表单区域 -->
     <energy-rate-modal ref="modalForm" @ok="modalFormOk"/>
+    <!-- 详情 -->
+    <energy-rate-detail ref="equipmentDetail"></energy-rate-detail>
 
   </a-card>
 </template>
@@ -146,6 +148,7 @@
   import EnergyRateModal from './modules/EnergyRateModal'
   import EnergyRateDetailSubTable from './subTables/EnergyRateDetailSubTable'
   import '@/assets/less/TableExpand.less'
+  import EnergyRateDetail from './modules/EnergyRateDetail.vue'
 
   export default {
     name: 'EnergyRateList',
@@ -153,6 +156,7 @@
     components: {
       EnergyRateModal,
       EnergyRateDetailSubTable,
+        EnergyRateDetail,
     },
     data() {
       return {
@@ -170,6 +174,7 @@
             title: '名称',
             align: 'center',
             dataIndex: 'name',
+            customCell: this.customCellDetail
           },
           {
             title: '能源分类',
@@ -241,6 +246,20 @@
           this.expandedRowKeys.push(record.id)
         }
       },
+      customCellDetail(record){
+        return {
+          style: {
+            'color': "#1890ff",
+            'cursor': "pointer",
+          },
+          on: { 
+            // 点击事件
+            click: (event) => {
+              this.$refs.equipmentDetail.detail(record);
+            },
+          },
+        };
+      },
       getSuperFieldList(){
         let fieldList=[];
         fieldList.push({type:'int',value:'energyrateid',text:'能源费率ID',dictCode:''})

src/views/module_base/energyRate/modules/EnergyRateDetail.vue

@@ -0,0 +1,154 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    @close="close"
+    destroyOnClose
+    :visible="visible"
+    class="equipment-detail-drawer"
+    >
+
+    <a-descriptions bordered>
+        <a-descriptions-item label="名称">
+            {{dataList.name}}
+        </a-descriptions-item>
+        <a-descriptions-item label="能源分类">
+            {{dataList.energytypeid_dictText}}
+        </a-descriptions-item>
+        <a-descriptions-item label="费率类型">
+            {{dataList.ratetype_dictText}}
+        </a-descriptions-item>
+        <a-descriptions-item label="单位">
+            {{dataList.rateunit}}
+        </a-descriptions-item>
+        <a-descriptions-item label="费率有效期开始">
+            {{dataList.begintime}}
+        </a-descriptions-item>
+        <a-descriptions-item label="费率有效期结束">
+            {{dataList.endtime}}
+        </a-descriptions-item>
+        <a-descriptions-item label="备注" :span="2">
+            {{dataList.remark}}
+        </a-descriptions-item>
+    </a-descriptions>
+
+    <a-divider orientation="left" style="font-size: 14px;"> 价格信息表 </a-divider>
+
+    <a-table
+        size="small"
+        :columns="columns"
+        :dataSource="logData"
+        :pagination="false"
+        :rowKey="(record, index) => { return index }"
+        bordered
+        class="j-table-force-nowrap"
+        >
+    </a-table>
+
+  </a-drawer>
+</template>
+
+<script>
+  import { httpAction, getAction } from '@/api/manage'
+  export default {
+    components: { 
+    },
+    name: 'RepairManageDetail',
+    data () {
+      return {
+        title:"详情",
+        width:'1000',
+        visible: false,
+        confirmLoading: false, // 加载中
+        dataList: {}, // 详情
+        logData: [], // 操作日志表格数据
+        // 表头
+        columns: [
+        ],
+        url: {
+            list: '/energyRate/energyRate/xqqueryById'
+        },
+      }
+    },
+    created(){
+    },
+    methods: {
+      detail (record) {
+        console.log(record)
+        this.dataList = record
+        getAction(this.url.list, {id:record.id}).then((res) => {
+        //   console.log(77777,res)
+          this.logData = res.result.baseEnergyRateDetailList
+          if (res.result.ratetype == 1) {
+            this.columns = [
+              {
+                title: '分时开始时间',
+                dataIndex: 'begintime',
+                key: 'begintime',
+                width:"200px",
+                align: 'center',
+              },
+              {
+                title: '分时结束时间',
+                dataIndex: 'endtime',
+                key: 'endtime',
+                width:"200px",
+                align: 'center',
+              },
+              {
+                title: '峰平谷',
+                dataIndex: 'pandv',
+                key: 'pandv',
+                width:"200px",
+                align: 'center',
+              },
+              {
+                title: '价格',
+                dataIndex: 'price',
+                key: 'price',
+                width:"200px",
+                align: 'center',
+              },
+            ]
+          } else {
+            this.columns = [
+              {
+                title: '起始量',
+                dataIndex: 'beginamount',
+                key: 'beginamount',
+                width:"200px",
+                align: 'center',
+              },
+              {
+                title: '结束量',
+                dataIndex: 'endamount',
+                key: 'endamount',
+                width:"200px",
+                align: 'center',
+              },
+              {
+                title: '价格',
+                dataIndex: 'price',
+                key: 'price',
+                width:"200px",
+                align: 'center',
+              },
+            ]
+          }
+        })
+        this.visible = true;
+      },
+      close () {
+        this.visible = false;
+      },
+      callback(key) {
+        console.log(key);
+      },
+
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+</style>

src/views/module_cmms/upkeepItem/modules/UpkeepItemForm.vue

@@ -19,7 +19,7 @@
               <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择设备类型"
-                multiple
+                :multiple="multiples"
                 v-model="model.equipdefid"
                 dict="tpm_equipment_tree,name,id"
                 pidField="parentid"
@@ -66,6 +66,7 @@
       return {
         model:{
          },
+        multiples: false,
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -101,10 +102,13 @@
     },
     methods: {
       add () {
-        this.edit(this.modelDefault);
+        // this.edit(this.modelDefault);
+        this.multiples = true;
+        this.visible = true;
       },
       edit (record) {
         this.model = Object.assign({}, record);
+        this.multiples = false;
         this.visible = true;
       },
       submitForm () {