Pārlūkot izejas kodu

报修人记录,冲销增加牧场

epans 2 gadi atpakaļ
vecāks
revīzija
ac00bd6d2e

BIN
dist-现代牧业-本地地址-20221205-1.zip


BIN
dist-现代牧业-正式地址-20221202-1.zip


BIN
dist-现代牧业-正式地址-20221205-1.zip


BIN
dist-现代牧业-正式地址-20221205-2.zip


BIN
dist-现代牧业-测试地址-20221205-1.zip


BIN
dist-现代牧业-测试地址-20221205-2.zip


BIN
dist-现代牧业-测试地址-20221205-3.zip


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
dist/index.html


+ 15 - 0
src/views/custom/allot/index.vue

@@ -558,6 +558,21 @@ export default {
     this.getList()
   },
 
+  watch: {
+ 
+    listAdd: {
+      deep: true,
+      handler: function (item) {
+          this.listAdd.forEach(function(i){
+            if(parseInt(i.amount) > (parseInt(i.reportery) )){
+              i.amount = parseInt(i.reportery) 
+            }
+                
+          })  
+      }
+    },
+  },
+
   methods: {
 
     handleCurrentChange(val) {

+ 4 - 4
src/views/custom/outStock/index.vue

@@ -2427,10 +2427,10 @@ export default {
             useTypeV: '@insertSpotList.useTypeV',
             note: '@insertSpotList.note'
           }}
-          this.postDataPramas.data[1].children[1] = { 'name': 'updatePartUseRepertory', 'type': 'e', 'parammaps': {
-            checkoutNumber: '@insertSpotList.amount',
-            partRepId: '@insertSpotList.partRepId'
-          }}
+          // this.postDataPramas.data[1].children[1] = { 'name': 'updatePartUseRepertory', 'type': 'e', 'parammaps': {
+          //   checkoutNumber: '@insertSpotList.amount',
+          //   partRepId: '@insertSpotList.partRepId'
+          // }}
           this.postDataPramas.data[2] = { 'name': 'updateBigPartTransfer', 'type': 'e', 'parammaps': {
             id: this.createTemp.id,
             statue: 4,

+ 13 - 1
src/views/custom/writeoff/index.vue

@@ -1,6 +1,9 @@
 <template>
   <div class="app-container">
     <div class="filter-container">
+      <el-select v-model="table1.getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
+        <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
+      </el-select>
       <el-select v-model="table1.getdataListParm.parammaps.writeoffType" style="width: 140px;" placeholder="冲销类型" class="filter-item" @change="change_type">
         <el-option v-for="item in writeoffList" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
@@ -35,6 +38,7 @@
           <span>{{ scope.$index + (table1.pageNum-1) * table1.pageSize + 1 }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="牧场" min-width="150px" align="center" prop="pastureName" />
       <el-table-column label="物料凭证号" min-width="150px" align="center" prop="materialCode" />
       <el-table-column label="物料凭证年度" min-width="150px" align="center" prop="proofYear" />
       <el-table-column label="凭证中的过账信息" min-width="150px" align="center" prop="chargeDate" />
@@ -48,6 +52,7 @@
             </template>
           </el-table-column>
       <el-table-column label="设备管理平台行号" min-width="150px" align="center" prop="rowNumber" />
+      <el-table-column label="状态" min-width="150px" align="center" prop="status" />
       <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="{row}">
           <el-button v-if="isWriteoffSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
@@ -148,6 +153,7 @@ export default {
   components: { Pagination },
   data() {
     return {
+      findAllPasture: [],
       requestParams: [
         { name: 'findAllProvider', offset: 0, pagecount: 0, params: [] },
         { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }},
@@ -155,7 +161,12 @@ export default {
         { name: 'findAllDepart', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }},
         { name: 'findAllEmploye', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid') }}
       ],
-      writeoffList:[{id:1,name:'备件入库'},{id:2,name:'备件退货'},{id:3,name:'备件出库'},{id:4,name:'备件退库'}], //冲销类型
+      writeoffList:[
+        {id:1,name:'备件入库'},
+        // {id:2,name:'备件退货'},
+        {id:3,name:'备件出库'},
+        // {id:4,name:'备件退库'}
+      ], //冲销类型
       invoicedReturnDocList:[{id:0,name:'否'},{id:1,name:'是'}],//是否已开票退货单
       materialVoucherNoList:[{id:0,name:'11111'},{id:1,name:'2222'}],//物料凭证号
       // table1:{
@@ -173,6 +184,7 @@ export default {
         getdataListParm: {
           name: 'getLaidProofList', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
           parammaps: {
+            
             pastureName: Cookies.get('pasturename'),
             writeoffType:'备件入库',
             orderNumber:'',

+ 7 - 7
src/views/report/equipmentIndex/index.vue

@@ -93,7 +93,7 @@
           <el-table-column label="单头牛指标(元)" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>
@@ -135,7 +135,7 @@
           <el-table-column label="单头牛指标(元)" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>
@@ -177,7 +177,7 @@
           <el-table-column label="单头牛指标(元)" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>
@@ -219,7 +219,7 @@
           <el-table-column label="单头牛指标(元)" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>
@@ -261,7 +261,7 @@
           <el-table-column label="单头牛指标" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>
@@ -303,7 +303,7 @@
           <el-table-column label="单头牛指标" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>
@@ -345,7 +345,7 @@
           <el-table-column label="单头牛指标" align="center">
             <el-table-column label="单头牛预算" sortable min-width="80px" align="center" prop="oneCowBudget" />
             <!-- <el-table-column label="单头牛内控" sortable min-width="80px" align="center" prop="oneCowLimit" /> -->
-            <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" />
+            <!-- <el-table-column label="单头牛迄今内控" sortable min-width="80px" align="center" prop="oneCowQmonthBudget" /> -->
             <el-table-column label="单头牛迄今实际" sortable min-width="80px" align="center" prop="oneCowSumPrice" />
             <el-table-column label="单头牛实际节约" sortable min-width="80px" align="center" prop="oneCowAsave" />
           </el-table-column>

+ 3 - 3
src/views/report/queryRepair/index.vue

@@ -46,7 +46,7 @@
       <div class="app-contentcard">
         <el-form ref="rowSeeData" :model="rowSeeData" label-position="right" label-width="120px" style="width: 100%;margin:0 auto;">
           <div class="filter-container">
-            <el-input v-model="getdataListParmSee.parammaps.eqName" placeholder="设备名称" clearable class="filter-item" style="width: 130px" />
+            <el-input v-model="getdataListParmSee.parammaps.eqName" placeholder="设备内部编号" clearable class="filter-item" style="width: 130px" />
             <el-input v-model="getdataListParmSee.parammaps.assetCode" placeholder="资产编号" clearable class="filter-item" style="width: 130px" />
             <el-date-picker ref="inputDatetime" v-model="getdataListParmSee.parammaps.inputDatetime" class="inputDatetime" type="datetimerange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="领用开始日期" end-placeholder="领用结束日期" />
 
@@ -487,7 +487,7 @@ export default {
           data: ['今年维修费用', '去年同期维修费用'],
           x: 'right'
         },
-        color: ['#42b983', '#769cfc', '#FFB800'],
+        color: [ '#769cfc', '#FFB800'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', data: chart_data2.months, name: '月份', axisLabel: { interval: 0, rotate: 30 }}],
         yAxis: [{ type: 'value', name: '元', axisLabel: { formatter: '{value}万' }}],
@@ -541,7 +541,7 @@ export default {
           data: ['今年维修费用', '去年同期维修费用'],
           x: 'right'
         },
-        color: ['#42b983', '#769cfc', '#FFB800'],
+        color: ['#769cfc', '#FFB800'],
         grid: { left: '3%', right: '10%', bottom: '4%', containLabel: true },
         xAxis: [{ type: 'category', data: chart_data3.months, name: '日期', axisLabel: { interval: 0, rotate: 30 }}],
         yAxis: [{ type: 'value', name: '元', axisLabel: { formatter: '{value}' }}],

+ 166 - 196
src/views/report/repairRecord/index.vue

@@ -1,190 +1,163 @@
 <template>
   <div class="app-container">
     <div v-if="isPercentage" class="percentage" style="width: 210px;height: 90px;background: #fff;position: fixed;bottom: 0;left: 0;z-index: 9999999999999;">
-      <h4 style="padding-left: 10px;line-height: 0;">导出进度</h4>
+      <h4 style="padding-left: 10px;line-height: 0;">导出进度:</h4>
       <el-progress style="padding-left: 10px;" :text-inside="true" :stroke-width="26" :percentage="percentage" />
     </div>
     <div class="filter-container">
-      <el-date-picker v-model="getdataListParm.parammaps.month" type="month" style="width: 250px;top:-3px;" placeholder="选择月份" format="yyyy-MM" value-format="yyyy-MM" />
-      <el-select v-model="getdataListParm.parammaps.pastureName" style="width: 140px;" placeholder="牧场" class="filter-item">
+      <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" class="filter-item" style="width: 120px;" @change="changePastureName">
         <el-option v-for="item in findAllPasture" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
+      <el-select v-model="getdataListParm.parammaps.departmentId" clearable placeholder="部门" class="filter-item" style="width: 120px;">
+        <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+
+      <el-date-picker
+            ref="inputDatetime"
+            v-model="getdataListParm.parammaps.inputDatetime"
+            class="inputDatetime"
+            type="datetimerange"
+            style="width: 250px;top:-3px;"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            range-separator="至"
+            start-placeholder="时间"
+            end-placeholder="时间"
+          />
+      <el-input v-model="getdataListParm.parammaps.name" placeholder="姓名" style="width: 200px;" class="filter-item" />
+ 
+ 
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
-      <el-button class="filter-item" style="position:absolute;right:10px" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
-    </div>
-    <el-table slot="reference" v-loading="listLoading" border :data="list" header-align="center" :row-style="rowStyle" :cell-style="cellStyle">
-      <template v-for="(item,index) in tablelist">
-        <el-table-column :key="index" show-overflow-tooltip sortable :prop="item.column_name" :label="item.label" :width="item.width" />
-      </template>
-    </el-table>
-    <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+      <el-button class="filter-item" type="success" icon="el-icon-download" style="float: right;" @click="handleDownload">导出</el-button>
 
+      <el-table
+        :key="tableKey"
+        v-loading="listLoading"
+        element-loading-text="给我一点时间"
+        :data="list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;"
+        :row-style="rowStyle"
+        :cell-style="tableCellStyle"
+        class="elTable"
+        show-summary
+      >
+        <el-table-column label="序号" align="center" type="index" width="50px">
+          <template slot-scope="scope">
+            <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="牧场" align="center" prop="name" />
+        <el-table-column label="月份" align="center" prop="deapartmentName" />
+        <el-table-column label="部门" align="center" prop="deapartmentName" />
+        <el-table-column label="姓名" align="center" prop="equipmentNumber" />
+        <el-table-column label="报修次数" align="center" prop="realNumber" />
+      </el-table>
+      <pagination v-show="total>=0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="getList" />
+    </div>
   </div>
 </template>
 
 <script>
 // 引入
-import { GetAccount, GetDataByNames } from '@/api/common'
-import waves from '@/directive/waves' // waves directive
+import { GetDataByName, GetDataByNames, getRecuData, GetAccount } from '@/api/common'
+import waves from '@/directive/waves'
+import { json2excel } from '@/utils/index.js'
 import Pagination from '@/components/Pagination'
-import { parseTime } from '@/utils/index.js'
+import TreeSelect from '@/components/TreeSelect'
 import Cookies from 'js-cookie'
-import { json2excel } from '@/utils/index.js'
-import { MessageBox } from 'element-ui'
 export default {
   name: 'RepairRecord',
-  components: { Pagination },
+  components: { Pagination, TreeSelect },
   directives: { waves },
   data() {
     return {
-      // ----------------------------------------------------
-      visible: false,
-      disabled: false,
-      findAllPasture: [],
+      findAllPasture: [], findAllDepart: [],
       requestParams: [
         { name: 'findAllPasture', offset: 0, pagecount: 0, returntype: 'Map', parammaps: { 'id': Cookies.get('pastureid') }}
       ],
-      rowStyle: { maxHeight: 30 + 'px', height: 25 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      total: 0,
+      getDepartParam: { name: 'findAllDepart1', offset: 0, pagecount: 0, parammaps: { 'pastureId': Cookies.get('pastureid'), 'eId': Cookies.get('employeid') }},
+      disabled: false, placeholder: '请选择设备类别',
+ 
+  
+ 
+   
+      getRecuListParm: { name: 'getAssetTypeList', idname: 'id', params: [-1] },
       tableKey: 0,
-      listLoading: true,
-      list: [],
-      listTest: {},
-      tablelist: [],
+      list: [
+        {id:1},
+        {id:1},
+        {id:1},
+        {id:1},
+      ],
+      total: 0,
+      listLoading: false,
       getdataListParm: {
-        name: 'getPartrepertryAccount',
-        page: 1,
-        offset: 1,
-        pagecount: 10,
-        returntype: 'Map',
-        parammaps: {
-          pastureName: Cookies.get('pasturename'),
-          month: parseTime(new Date(), '{y}-{m}')
-        }
-
+        name: 'getEquipmentAndEquipmentStandard', page: 1, offset: 1, pagecount: 10, returntype: 'Map',inputDatetime: '',
+        parammaps: { pastureId: Cookies.get('pastureid'), pastureName: Cookies.get('pasturename'), departmentName: '', eqClassId: '' }
       },
-      dialogStatus: '',
-      dialogFormVisible: false,
-      isokDisable: false,
-      rules: { },
-      textMap: { },
-      months: [],
-      month: [],
+      requestParam: { name: 'insertAsset', offset: 0, pagecount: 0, parammaps: {}}, statueReason: false,
       downLoadParm: {},
       downLoadList: [],
+      pageNum: 0,
+      pageSize: 0,
       isPercentage: false,
-      percentage: 1
+      percentage: 1,
+      isokDisable: false,
+      rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
     }
-  },
-  computed: {
-
   },
   created() {
-    this.getList()
     this.get_select_list()
-    // this.getMonths()
+   // this.getList()
+ 
   },
   methods: {
-    forDight(_num, _x) {
-      var n = 1
-      for (var i = 0; i < _x; i++) {
-        n = n * 10
-      }
-      return Math.round(_num * n) / n
-    },
     get_select_list() {
       GetDataByNames(this.requestParams).then(response => {
-        this.findAllPasture = response.data.findAllPasture.list
+        if (response.data.list !== null) {
+          this.findAllPasture = response.data.findAllPasture.list
+          this.getDepartDownList()
+        }
+      })
+    },
+    getDepartDownList() {
+      GetDataByName(this.getDepartParam).then(response => {
+        this.findAllDepart = response.data.list
       })
     },
+    changePastureName(item) {
+      this.getDepartParam.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == item).id
+      this.getdataListParm.parammaps.departmentId = ''
+      this.getDepartDownList()
+    },
     getList() {
       this.listLoading = true
-      // this.getdataListParm.month = parseTime(new Date(), '{y}-{m}') // 更改为请求的月份
-      // this.getdataListParm.month = '2020-03' // 更改为请求的月份
-      // this.getdataListParm.timeout = 80000
-      GetAccount(this.getdataListParm).then(response => {
+      if (this.getdataListParm.parammaps.pastureName == '现代牧业') {
+        // this.getdataListParm.parammaps.pastureName = ''
+        this.getdataListParm.parammaps.pastureId = ''
+      }
+
+      if (this.$refs['inputDatetime'] !== undefined && this.$refs['inputDatetime'].value !== null) {
+        this.getdataListParm.parammaps.startTime = this.$refs['inputDatetime'].value[0]
+        this.getdataListParm.parammaps.stopTime = this.$refs['inputDatetime'].value[1]
+      } else {
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      }
+      GetDataByName(this.getdataListParm).then(response => {
         console.log('table数据', response.data.list)
         if (response.data.list !== null) {
           this.list = response.data.list
+          this.pageNum = response.data.pageNum
+          this.pageSize = response.data.pageSize
         } else {
           this.list = []
         }
-        this.pageNum = response.data.pageNum
-        this.pageSize = response.data.pageSize
-        if (response.data.total) {
-          this.total = response.data.total
-        }
-        var temp = this.getdataListParm.parammaps.month.split('-')
-        var year = temp[0]
-        var month = temp[1]
-        var d = new Date(year, month, 0)
-        var table = [{ 'label': '序号', 'column_name': 'i' }, { 'label': '牧场', 'column_name': 'pastureName' }, { 'label': '月份', 'column_name': 'month' }, { 'label': '备件编号', 'column_name': 'partCode', 'width': '120' }, { 'label': '备件名称', 'column_name': 'partName' }, { 'label': '备件规格', 'column_name': 'specification' }, { 'label': '单位', 'column_name': 'unit' }, { 'label': '品牌', 'column_name': 'brandName' }, { 'label': '供应商', 'column_name': 'providerName' }, { 'label': '单价', 'column_name': 'price' }, { 'label': '期初数量', 'column_name': 'startSum' }, { 'label': '期初金额', 'column_name': 'startPrice' }]
-        for (let index = 1; index <= d.getDate(); index++) {
-          // eslint-disable-next-line no-undef
-          index = JSON.stringify(index)
-          const index1 = '入库数量' + index + '日'
-          const index2 = '入库金额' + index + '日'
-          const m1 = { 'label': index1, 'column_name': 'laid' + index, 'width': '80' }
-          const m2 = { 'label': index2, 'column_name': 'laidPrice' + index, 'width': '80' }
-
-          table.push(m1)
-          table.push(m2)
-        }
-        const m3 = { 'label': '合计入库数量', 'column_name': 'Sumlaid', 'width': '120' }
-        const m4 = { 'label': '合计入库金额', 'column_name': 'SumlaidPrice', 'width': '120' }
-        table.push(m3)
-        table.push(m4)
-        console.log(d.getDate(), '----------')
-        for (let index = 1; index <= d.getDate(); index++) {
-          // eslint-disable-next-line no-undef
-          index = JSON.stringify(index)
-          const index5 = '出库数量' + index + '日'
-          const index6 = '出库金额' + index + '日'
-          const m5 = { 'label': index5, 'column_name': 'use' + index, 'width': '80' }
-          const m6 = { 'label': index6, 'column_name': 'usePrice' + index, 'width': '80' }
-
-          table.push(m5)
-          table.push(m6)
-        }
-        const m7 = { 'label': '合计出库数量', 'column_name': 'Sumuse', 'width': '120' }
-        const m8 = { 'label': '合计出库金额', 'column_name': 'SumusePrice', 'width': '120' }
-        const m9 = { 'label': '退货数量', 'column_name': 'THsum', 'width': '120' }
-        const m10 = { 'label': '退货金额', 'column_name': 'THsumPrice', 'width': '120' }
-        const m11 = { 'label': '期末数量', 'column_name': 'endSum', 'width': '120' }
-        const m12 = { 'label': '期末金额', 'column_name': 'endSumPrice', 'width': '120' }
-        table.push(m7)
-        table.push(m8)
-        table.push(m9)
-        table.push(m10)
-        table.push(m11)
-        table.push(m12)
-        this.tablelist = table
-        if (this.list !== null) {
-          for (var i = 0; i < this.list.length; i++) {
-            this.list[i].i = i + 1
-            console.log(this.list[i])
-            this.$set(this.list[i], 'startPrice', this.forDight((parseFloat(this.list[i].startSum) * parseFloat(this.list[i].price)), 3)) // 期初金额
-            this.$set(this.list[i], 'SumlaidPrice', this.forDight((parseFloat(this.list[i].Sumlaid) * parseFloat(this.list[i].price)), 3)) // 合计入库金额
-            this.$set(this.list[i], 'SumusePrice', this.forDight((parseFloat(this.list[i].Sumuse) * parseFloat(this.list[i].price)), 3)) // 合计出库金额
-            this.$set(this.list[i], 'THsumPrice', this.forDight((parseFloat(this.list[i].THsum) * parseFloat(this.list[i].price)), 3)) // 退货金额
-            this.$set(this.list[i], 'endSumPrice', this.forDight((parseFloat(this.list[i].endSum) * parseFloat(this.list[i].price)), 3)) // 期末金额
-
-            for (let index = 1; index <= d.getDate(); index++) {
-              index = JSON.stringify(index)
-              console.log('laid' + index)
-              const laid = 'laid' + index
-              const use = 'use' + index
-              console.log(this.list[i][laid]) // underfind
-
-              this.$set(this.list[i], 'laidPrice' + index, this.forDight((parseFloat(this.list[i][laid]) * parseFloat(this.list[i].price)), 3)) // 入库金额
-              this.$set(this.list[i], 'usePrice' + index, this.forDight((parseFloat(this.list[i][use]) * parseFloat(this.list[i].price)), 3)) // 出库金额
-            }
-          }
-        }
-        console.log('table数据', this.list)
-        console.log('表头数据', this.tablelist)
-        this.$forceUpdate()
+        this.total = response.data.total
         setTimeout(() => {
           this.listLoading = false
         }, 100)
@@ -193,11 +166,26 @@ export default {
     form_search() {
       this.listLoading = true
       this.getdataListParm.offset = 1
+      this.getdataListParm.parammaps.pastureId = this.findAllPasture.find(obj => obj.name == this.getdataListParm.parammaps.pastureName).id
       this.getList()
     },
 
+  
+  
+    tableCellStyle({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 3) {
+        return {
+          textDecoration: 'underline'
+        }
+      }
+      return {
+        textDecoration: 'none'
+      }
+    },
+   
+
     handleDownload() {
-      this.$alert('备件台账信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
+      this.$alert('设备基础信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
       this.isPercentage = true
       this.percentage = 1
       var timer = setInterval(() => {
@@ -208,76 +196,58 @@ export default {
         }
         this.percentage = this.percentage
       }, 1000)
-      this.downLoadParm.name = 'getPartrepertryAccount'
-      this.downLoadParm.returntype = 'Map'
-      // this.downLoadParm.timeout = 80000
+      this.downLoadParm.name = 'getAssetList'
       this.downLoadParm.parammaps = this.getdataListParm.parammaps
       GetAccount(this.downLoadParm).then(response => {
+        this.downLoadList = response.data.list
         if (response.data.list !== '') {
           this.percentage = 99
           setTimeout(() => {
             this.isPercentage = false
           }, 2000)
         }
-        this.$nextTick(() => {
-          this.downLoadList = response.data.list
-          if (response.data.list !== null) {
-            const temp = this.getdataListParm.parammaps.month.split('-')
-            const year = temp[0]
-            const month = temp[1]
-            const d = new Date(year, month, 0)
-            for (let i = 0; i < response.data.list.length; i++) {
-              this.$set(response.data.list[i], 'startPrice', this.forDight((parseFloat(response.data.list[i].startSum) * parseFloat(response.data.list[i].price)), 3)) // 期初金额
-              this.$set(response.data.list[i], 'SumlaidPrice', this.forDight((parseFloat(response.data.list[i].Sumlaid) * parseFloat(response.data.list[i].price)), 3)) // 合计入库金额
-              this.$set(response.data.list[i], 'SumusePrice', this.forDight((parseFloat(response.data.list[i].Sumuse) * parseFloat(response.data.list[i].price)), 3)) // 合计出库金额
-              this.$set(response.data.list[i], 'THsumPrice', this.forDight((parseFloat(response.data.list[i].THsum) * parseFloat(response.data.list[i].price)), 3)) // 退货金额
-              this.$set(response.data.list[i], 'endSumPrice', this.forDight((parseFloat(response.data.list[i].endSum) * parseFloat(response.data.list[i].price)), 3)) // 期末金额
-              for (let index = 1; index <= d.getDate(); index++) {
-                index = JSON.stringify(index)
-                console.log('laid' + index)
-                const laid = 'laid' + index
-                const use = 'use' + index
-                console.log(response.data.list[i][laid]) // underfind
-
-                this.$set(response.data.list[i], 'laidPrice' + index, this.forDight((parseFloat(response.data.list[i][laid]) * parseFloat(response.data.list[i].price)), 3)) // 入库金额
-                this.$set(response.data.list[i], 'usePrice' + index, this.forDight((parseFloat(response.data.list[i][use]) * parseFloat(response.data.list[i].price)), 3)) // 出库金额
-              }
-            }
-          }
-          console.log(this.tablelist)
-          const tHeader = []
-          const filterVal = []
-          for (let i = 1; i < this.tablelist.length; i++) {
-            tHeader.push(this.tablelist[i].label)
-            filterVal.push(this.tablelist[i].column_name)
+        console.log(this.downLoadList)
+        const elecExcelDatas = [
+          {
+            tHeader: ['设备类别', '资产编号', '设备名称', '设备内部编号', '设备规格', '品牌', '供应商', '用途', '状态', '购置日期', '入场日期', '折旧年限', '财务编号', '原值', '残值', '月核减值', '保养级别', '保养费用', '维修费用', '基数(小时)', '牧场', '部门', '责任人', '录入人', '录入时间', '折旧年限', '使用时长(年)', '使用率(%)'],
+            filterVal: ['eqClassName', 'assetCode', 'eqName', 'eqCode', 'specification', 'brandName', 'providerName', 'purpose', 'status', 'purchaseDate', 'entranceDate', 'depreciation', 'financeCode', 'yuanzhi', 'salvage', 'subtractvalue', 'upkeepgrade', 'yearUpkeepCost', 'yearMaintainCost', 'baseHours', 'pastureName', 'deptName', 'employeName', 'inputUserName', 'inputDatetime', 'depreciation', 'serviceDuration', 'utilizationRate'],
+            tableDatas: this.downLoadList,
+            sheetName: '设备基础信息'
           }
-          console.log(tHeader, filterVal)
-          const ExcelDatas = [
-            {
-              tHeader: tHeader,
-              filterVal: filterVal,
-              tableDatas: this.downLoadList,
-              sheetName: '备件台账'
-            }
-          ]
-          json2excel(ExcelDatas, '备件台账', true, 'xlsx')
-        })
+        ]
+        json2excel(elecExcelDatas, '设备基础信息', true, 'xlsx')
       })
     }
+
   }
 }
 </script>
 <style lang="scss" scoped>
-.el-input--small .el-input__inner{
-  height: 38px !important;
-}
-.el-table .cell.el-tooltip{
-  text-align: center;
-}
-.el-table th>.cell{
-  text-align: center;
-}
-.el-table .cell.el-tooltip{
-  white-space:pre-wrap;
-}
+  .el-autocomplete-suggestion li{
+    padding:0 3px!important;
+  }
+  .el-table .warning-row {
+      background: oldlace;
+  }
+  .el-table .success-row {
+      background: #f0f9eb;
+  }
+</style>
+<style lang="scss">
+  .upkeepgrade .el-form-item__label{
+    line-height: 20px;
+  }
+  .inputDatetime .el-range-separator{
+   padding: 0;
+   margin: 0 10px;
+  }
+  .el-radio__label{
+    padding-left: 2px !important;
+  }
+  .typeSelect span .el-popover__reference .el-input--suffix {
+    top:-3px;
+    .el-input__inner{
+      height:40px !important;
+    }
+  }
 </style>

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels