Browse Source

水电添加了时间勾选框;备件出库入库删除了模板,EAS同步

段小段 1 year ago
parent
commit
cf528b0158

BIN
dist.zip


File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 17 - 4
src/views/cost/elec/index.vue

@@ -8,15 +8,16 @@
       <el-select v-model="getdataListParm.parammaps.pastureName" placeholder="牧场" style="width: 140px;" class="filter-item" @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.departName" clearable placeholder="部门" class="filter-item">
+      <el-select v-model="getdataListParm.parammaps.departName" style="width: 140px;" clearable placeholder="部门" class="filter-item">
         <el-option v-for="item in findAllDepart" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       <el-input v-model="getdataListParm.parammaps.formNumber" placeholder="编号" style="width: 140px;" class="filter-item" />
       <el-input v-model="getdataListParm.parammaps.formName" placeholder="表名称" style="width: 140px;" class="filter-item" />
-      <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
+      <el-select v-model="getdataListParm.parammaps.formType" style="width: 140px;" clearable placeholder="表结构" class="filter-item">
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
       <el-date-picker v-model="getdataListParm.parammaps.createDate" type="date" placeholder="日期" style="width:140px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+      <el-date-picker v-model="getdataListParm.parammaps.inputDatetime" clearable class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
         <el-button v-if="isElecAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
@@ -350,7 +351,10 @@ export default {
           formNumber: '',
           formType: '',
           pastureName: Cookies.get('pasturename'),
-          departName: ''
+          departName: '',
+          inputDatetime:[],
+          startTime:'',
+          stopTime:''
         }
       },
       // 2-3:下拉框请求后数据加入[]
@@ -556,7 +560,8 @@ export default {
       this.requestParam.parammaps.formName = this.getdataListParm.parammaps.formName
       this.requestParam.parammaps.formNumber = this.getdataListParm.parammaps.formNumber
       this.requestParam.parammaps.useType = this.getdataListParm.parammaps.formType
-
+      this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
+      this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
       this.requestParam.parammaps.formType = '电表'
       GetAccount(this.requestParam).then(response => {
         if (response.data.list !== '') {
@@ -731,6 +736,14 @@ export default {
     // 1-1: table&搜索
     get_table_data() {
       this.listLoading = true
+      if(this.getdataListParm.parammaps.inputDatetime !== null && this.getdataListParm.parammaps.inputDatetime.length > 0){
+        this.getdataListParm.parammaps.startTime = parseTime(this.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.getdataListParm.parammaps.stopTime = parseTime(this.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      }else{
+        this.getdataListParm.parammaps.inputDatetime = []
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      }
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
           this.list = []

+ 22 - 2
src/views/cost/water/index.vue

@@ -14,9 +14,10 @@
       </el-select>
       <el-input v-model="getdataListParm.parammaps.formNumber" placeholder="编号" clearable class="filter-item" style="width: 130px" />
       <el-input v-model="getdataListParm.parammaps.formName" placeholder="表名称" style="width: 140px;" class="filter-item" />
-      <el-select v-model="getdataListParm.parammaps.formType" clearable placeholder="表结构" class="filter-item">
+      <el-select v-model="getdataListParm.parammaps.formType" clearable  style="width: 140px;" placeholder="表结构" class="filter-item">
         <el-option v-for="item in useTypes" :key="item.id" :label="item.name" :value="item.name" />
       </el-select>
+      <el-date-picker v-model="getdataListParm.parammaps.inputDatetime" clearable class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
       <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
       <div>
         <el-button v-if="isWaterAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
@@ -41,7 +42,9 @@
       :cell-style="cellStyle"
       class="elTable"
       @sort-change="tableSort1"
+      @selection-change="handleSelectionChange"
     >
+      <el-table-column type="selection" width="55" />
       <el-table-column label="序号" align="center" type="index" width="50px">
         <template slot-scope="scope">
           <span>{{ scope.$index + (pageNum-1) * pageSize + 1 }}</span>
@@ -338,7 +341,10 @@ export default {
           formNumber: '',
           formType: '',
           pastureName: Cookies.get('pasturename'),
-          departName: ''
+          departName: '',
+          inputDatetime:[],
+          startTime:'',
+          stopTime:''
         }
       },
       // 2-3:下拉框请求后数据加入[]
@@ -542,6 +548,8 @@ export default {
       this.requestParam.parammaps.formName = this.getdataListParm.parammaps.formName
       this.requestParam.parammaps.formNumber = this.getdataListParm.parammaps.formNumber
       this.requestParam.parammaps.useType = this.getdataListParm.parammaps.formType
+      this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
+      this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
       GetAccount(this.requestParam).then(response => {
         this.$nextTick(() => {
           import('@/vendor/Export2Excel').then(excel => {
@@ -552,6 +560,7 @@ export default {
                 this.isPercentage = false
               }, 2000)
             }
+
             const tHeader = [
               '编号', '牧场', '表名称', '表编号', '抄表日期', '用量', '单价', '录入人', '备注'
             ]
@@ -738,6 +747,14 @@ export default {
     // 1-1: table&搜索
     get_table_data() {
       this.listLoading = true
+      if(this.getdataListParm.parammaps.inputDatetime !== null && this.getdataListParm.parammaps.inputDatetime.length > 0){
+        this.getdataListParm.parammaps.startTime = parseTime(this.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+        this.getdataListParm.parammaps.stopTime = parseTime(this.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      }else{
+        this.getdataListParm.parammaps.inputDatetime = []
+        this.getdataListParm.parammaps.startTime = ''
+        this.getdataListParm.parammaps.stopTime = ''
+      }
       GetDataByName(this.getdataListParm).then(response => {
         if (response.data.list == null) {
           this.list = []
@@ -1067,6 +1084,9 @@ export default {
           this.listLoadingDosageRecord = false
         }, 100)
       })
+    },
+    handleSelectionChange(val){
+
     }
   }
 }

+ 9 - 1
src/views/custom/custom/index.vue

@@ -14,6 +14,9 @@
       <el-autocomplete v-model="getdataListParm.parammaps.providerName" value-key="providerName" class="inline-input" :fetch-suggestions="providerSearch" placeholder="供应商" style="width:150px;top:-3px;" @select="handleSelectProvider" />
       <el-autocomplete v-model="getdataListParm.parammaps.brandName" value-key="brandName" class="inline-input" :fetch-suggestions="brandSearch" placeholder="品牌" style="width:150px;top:-3px;" @select="handleSelectBrand" />
       <el-input v-model="getdataListParm.parammaps.location" placeholder="库位" style="width: 160px;" class="filter-item" />
+      <el-select v-model="getdataListParm.parammaps.isXz" clearable placeholder="是否闲置" class="filter-item" style="width: 120px;">
+        <el-option v-for="item in isXzList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
       <el-input v-model="getdataListParm.parammaps.contractCode" placeholder="合同编号" style="width: 140px;" class="filter-item" />
       <el-select v-model="getdataListParm.parammaps.statue" clearable placeholder="合同状态" class="filter-item" style="width: 120px;">
         <el-option v-for="item in statues" :key="item.id" :label="item.name" :value="item.name" />
@@ -122,7 +125,11 @@
           <span>{{ scope.row.daysInStorage }}</span>
         </template>
       </el-table-column> 
-      
+      <el-table-column label="闲置备件" sortable prop="price" min-width="60px" align="center">
+        <template slot-scope="scope">
+          <span>{{ scope.row.xzparts }}</span>
+        </template>
+      </el-table-column> 
       <el-table-column label="最高库存" sortable prop="maxRepertory" min-width="100px" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.maxRepertory }}</span>
@@ -712,6 +719,7 @@ export default {
         parammaps: {}
       },
       warnings: [{ id: '1', name: '高' }, { id: '2', name: '低' }, { id: '3', name: '正常' }],
+      isXzList: [{ id: '0', name: '否' }, { id: '1', name: '是' }],
       isZeroStocks: [{ id: '0', name: '否' }, { id: '1', name: '是' }],
       statues: [{ id: '1', name: '正常' }, { id: '2', name: '已过期' }, { id: '3', name: '终止' }],
       getdataListParm: {

+ 204 - 28
src/views/custom/outStock/index.vue

@@ -39,10 +39,14 @@
           <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
             <el-button v-if="isOutStockAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
+            <!-- <el-button v-if="isReceiveTemplate" v-waves class="filter-item" type="info" icon="el-icon-download" @click="handleDownloadTemp"> 模板 </el-button> -->
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
               <el-button v-if="isOutStockImport" v-waves class="filter-item" type="warning" icon="el-icon-upload2">导入</el-button>
             </el-upload>
+            <el-button v-if="isOutStockExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-edit" @click="handleDownload">导出</el-button>
             <!-- <el-button class="filter-item" style="margin-left: 10px;" type="danger" icon="el-icon-upload2" @click="handleDownloadEas">导出EAS</el-button> -->
+            <!-- <el-button class="filter-item" style="margin-left: 10px;" type="danger" icon="el-icon-upload2" @click="handleDownloadEas1">导出EAS</el-button> -->
+            <!-- <el-button v-if="isEasSynchronization" class="filter-item" type="primary" style="float: right;" @click="handleEAS">EAS同步</el-button> -->
             <el-button v-if="isOutsap"  class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
           </div>
         </div>
@@ -109,7 +113,7 @@
               <template slot-scope="scope">
                 <span v-if="scope.row.ProofCode">已上传</span>
                 <span v-else>未上传</span>
-
+            
               </template>
             </el-table-column>
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
@@ -118,7 +122,7 @@
                 <span v-else>未冲销</span>
               </template>
             </el-table-column>
-
+            
           <el-table-column label="操作" align="center" width="250" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
               <el-button v-if="isOutStockSee" type="primary" size="mini" @click="form_see(row)">查看</el-button>
@@ -924,7 +928,7 @@
             </template>
           </el-table-column>
 
-
+          
           <el-table-column :key="19" label="备注" prop="sumPrice" align="center" min-width="80">
             <template slot-scope="scope">
               <span>{{ scope.row.note }}</span>
@@ -1087,8 +1091,8 @@ export default {
       dialogPvVisible: false,
       // 校验规则
       // -----------------------------------------
-      isOutStockAdd: [],  isOutStockImport: [], isOutStockExport: [], isOutStockSee: [], isOutStockDelete: [], isOutStockMethod1: [], isOutStockMethod2: [], isOutStockMethod3: [],isOutStockMethod4:[],
-      isManualSynchronization: [], isCloseSynchronization: [], isIgnoreSynchronization: [],
+      isOutStockAdd: [], isReceiveTemplate: [], isOutStockImport: [], isOutStockExport: [], isOutStockSee: [], isOutStockDelete: [], isOutStockMethod1: [], isOutStockMethod2: [], isOutStockMethod3: [],isOutStockMethod4:[],
+      isEasSynchronization: [], isManualSynchronization: [], isCloseSynchronization: [], isIgnoreSynchronization: [],
       rules: {},
       rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
       cellStyle: { padding: 0 + 'px' },
@@ -1336,7 +1340,7 @@ export default {
   },
 
   watch: {
-
+ 
     listAdd: {
       deep: true,
       handler: function (item) {
@@ -1348,10 +1352,10 @@ export default {
             if(parseInt(i.checkoutNumber) > parseInt(i.reportery)){
               i.checkoutNumber = i.reportery
             }
-
+                
           })
 
-
+            
       }
     },
 
@@ -1386,14 +1390,14 @@ export default {
 
     checkboxInit(row,index){
       // console.log(row)
-      if(row.ProofCode){
-        return 0
+      if(row.ProofCode){ 
+        return 0 
       } else {
 
         var data1 = new Date(row.creatTime)
         var data2 = new Date('2022-10-25')
         if(data1 > data2){ return 1 } else {return 0}
-
+ 
       }
     },
 
@@ -1404,7 +1408,7 @@ export default {
     },
 
     sapUpload(){
-      const that = this
+      const that = this 
       console.log("currentRow ProofCode",this.currentRow.ProofCode)
       var send_data = this.selectList
 
@@ -1421,18 +1425,18 @@ export default {
          that.isSap = 0
          SapUse(send_data).then(response => {
               console.log('response', response)
-
+                
               if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
                 that.get_table_data()
-
+                
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
                 }
             })
-
-
+ 
+            
       } else {
 
         that.$notify({ title: '失败', message: '正在请求中,请稍等几秒钟后再点击'  , type: 'error', duration: 2000 })
@@ -1444,35 +1448,35 @@ export default {
 
 
 
-
-
+      
+    
       // if(this.currentRow.ProofCode){
       //    console.log("currentRow ProofCode 这个值说明已经上传了,不用上传")
       //   //如果有这个值说明已经上传了,不用上传
       // } else {
       //   console.log("currentRow ProofCode没有这个值")
       //   console.log("currentRow ProofCode",this.currentRow.ProofCode)
-      //     const useForm = this.currentRow.useForm
-      //     const creatTime = this.currentRow.creatTime
+      //     const useForm = this.currentRow.useForm 
+      //     const creatTime = this.currentRow.creatTime 
       //     console.log("useForm",useForm)
       //       var send_data = {
       //             "useForm":useForm,
       //             "receiveTime":creatTime,
       //             "pastureid":Cookies.get('pastureid')
-
+              
       //       }
       //       SapUse(send_data).then(response => {
       //         console.log('response', response)
-
+                
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
       //           that.get_table_data()
-
+                
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
       //           }
       //       })
-
+ 
       // }
 
     },
@@ -1488,7 +1492,9 @@ export default {
       const isOutStockAdd = checkButtons(this.$store.state.user.buttons, OutStockAdd)
       this.isOutStockAdd = isOutStockAdd
 
-
+      const ReceiveTemplate = 'customs:outStock:template'
+      const isReceiveTemplate = checkButtons(this.$store.state.user.buttons, ReceiveTemplate)
+      this.isReceiveTemplate = isReceiveTemplate
 
       const OutStockImport = 'customs:outStock:import'
       const isOutStockImport = checkButtons(this.$store.state.user.buttons, OutStockImport)
@@ -1522,7 +1528,9 @@ export default {
       const isOutStockMethod4 = checkButtons(this.$store.state.user.buttons, OutStockMethod4)
       this.isOutStockMethod4 = isOutStockMethod4
 
-      
+      const EasSynchronization = 'customs:outStock:easSynchronization'
+      const isEasSynchronization = checkButtons(this.$store.state.user.buttons, EasSynchronization)
+      this.isEasSynchronization = isEasSynchronization
 
       const ManualSynchronization = 'customs:outStock:manualSynchronization'
       const isManualSynchronization = checkButtons(this.$store.state.user.buttons, ManualSynchronization)
@@ -1874,7 +1882,7 @@ export default {
 
       // this.createTemp.departmentId = item.departmentId
       this.$set(this.createTemp, "departmentId", item.departmentId)
-
+      
       this.createTemp.bid = item.id
       this.createTemp.applicatId = item.empId
       this.orderPart.applyCode = item.applyCode
@@ -2672,7 +2680,67 @@ export default {
         })
       )
     },
+    // 导出
+    handleDownload() {
+      this.$alert('备件出库信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
+      this.isPercentage = true
+      this.percentage = 1
+      var timer = setInterval(() => {
+        this.percentage += 5
+        if (this.percentage > 95) {
+          this.percentage = 99
+          clearInterval(timer)
+        }
+        this.percentage = this.percentage
+      }, 1000)
+      this.requestParam.parammaps.formType = '备件出库信息'
+      this.requestParam.parammaps.inputDatetime = this.getdataListParm.parammaps.inputDatetime
+      this.requestParam.parammaps.pastureName = this.getdataListParm.parammaps.pastureName
+      this.requestParam.parammaps.departmentId = this.getdataListParm.parammaps.departmentId
+      this.requestParam.parammaps.useForm = this.getdataListParm.parammaps.useForm
+      this.requestParam.parammaps.useType = this.getdataListParm.parammaps.useType
+      this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
+      this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
+      GetAccount(this.requestParam).then(response => {
+        this.$nextTick(() => {
+          import('@/vendor/Export2Excel').then(excel => {
+
+
+            if (response.data.list !== null) {
+              for (let i = 0; i < response.data.list.length; i++) {
+                
+                if(response.data.list[i].sterilisation == 1){
+                  this.$set(response.data.list[i], 'sterilisation', "已冲销")
+                } else {
+                  this.$set(response.data.list[i], 'sterilisation', "未冲销")
+                } 
+              }
+            }
+
+
+
+            const list1 = response.data.list
+            if (response.data.list !== '') {
+              this.percentage = 99
+              setTimeout(() => {
+                this.isPercentage = false
+              }, 2000)
+            }
+
+
+
 
+            const tHeader = [
+              '牧场', '领用单编号', '领用日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '实发数量', '单价', '总价', '库位', '供应商', '名称', '牧场设备编号','资产品牌', '领用类型', '领用部门', '领用人', '备注', '冲销状态']
+            const filterVal = [
+              'pastureName', 'useForm', 'creatTime', 'partCode', 'partName', 'specification', 'brandName', 'unit', 'checkoutNumber', 'price', 'sumPrice', 'warehoseCode', 'providerName', 'eqName', 'eqCode', 'eqBrand','useTypeV', 'departmentName', 'appliname', 'note', 'sterilisation'
+            ]
+            const data1 = this.formatJson(filterVal, list1)
+            excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.requestParam.parammaps.formType, autoWidth: true, bookType: 'xlsx' })
+          })
+        })
+      })
+    },
     handleDownload2() {
       this.$alert('备件出库记录正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
       this.isPercentage = true
@@ -2795,6 +2863,66 @@ export default {
         })
       })
     },
+    handleDownloadEas1() {
+      this.$alert('备件出库EAS信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
+      this.isPercentage = true
+      this.percentage = 1
+      var timer = setInterval(() => {
+        this.percentage += 5
+        if (this.percentage > 95) {
+          this.percentage = 99
+          clearInterval(timer)
+        }
+        this.percentage = this.percentage
+      }, 1000)
+      this.requestParam.name = 'downloadPartUseEASYuan'
+      this.requestParam.parammaps.inputDatetime = this.getdataListParm.parammaps.inputDatetime
+      this.requestParam.parammaps.pastureName = this.getdataListParm.parammaps.pastureName
+      this.requestParam.parammaps.departmentId = this.getdataListParm.parammaps.departmentId
+      this.requestParam.parammaps.useForm = this.getdataListParm.parammaps.useForm
+      this.requestParam.parammaps.useType = this.getdataListParm.parammaps.useType
+      this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
+      this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
+      GetAccount(this.requestParam).then(response => {
+        if (response.data.list !== '') {
+          this.percentage = 99
+          setTimeout(() => {
+            this.isPercentage = false
+          }, 2000)
+        }
+        this.$nextTick(() => {
+          import('@/vendor/Export2Excel').then(excel => {
+            const list1 = response.data.list
+            const tHeader = [
+              '领用部门', '牧场', '领用单编号', '领用日期', '供应商编码', '供应商名称', '出库人', '制单日期', '品名', '物料编码', '计量单位', '单价', '实发数量', '总价', '备注', '领用人', '费用类型'
+            ]
+            const filterVal = [
+              '领用部门', '牧场', '领用单编号', '领用日期', '供应商编码', '供应商名称', '出库人', '制单日期', '品名', '物料编码', '计量单位', '单价', '实发数量', '总价', '备注', '领用人', '费用类型'
+            ]
+            // const tmerges=['B1:D2']
+            if (list1 !== null) {
+              const data1 = this.formatJsonTemp(filterVal, list1)
+              excel.export_json_to_excel({
+                // merges: tmerges,
+                // multiHeader: tmultiHeader,
+                header: tHeader,
+                data: data1,
+                filename: '备件出库EAS',
+                autoWidth: true,
+                bookType: 'xlsx'
+              })
+            } else {
+              this.$notify({
+                title: '',
+                message: '无备件领用完成信息,无法导出!',
+                type: 'warning',
+                duration: 2000
+              })
+            }
+          })
+        })
+      })
+    },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v =>
         filterVal.map(j => {
@@ -2854,6 +2982,54 @@ export default {
       console.log('编辑保存')
     },
 
+    // 导出模板
+    handleDownloadTemp() {
+      this.requestParam.name = 'stockLaidDownTemp'
+      GetDataByName(this.requestParam).then(response => {
+        this.$nextTick(() => {
+          import('@/vendor/Export2Excel').then(excel => {
+            const list1 = response.data.list
+            const tHeader = [
+              '牧场', '领用单编号', '领用日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '实发数量', '单价', '总价', '库位', '供应商', '名称', '牧场设备编号', '具体用处', '领用类型', '领用部门', '领用人'
+            ]
+            const filterVal = [
+              '牧场', '领用单编号', '领用日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '实发数量', '单价', '总价', '库位', '供应商', '名称', '牧场设备编号', '具体用处', '领用类型', '领用部门', '领用人'
+            ]
+            const data1 = this.formatJsonTemp(filterVal, list1)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data: data1,
+              filename: '出库模板',
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        })
+      })
+    },
+    handleEAS() {
+      this.easStatus.dialogStatus = 'easStatus'
+      this.easStatus.dialogFormVisible = true
+      this.get_table_dataEasStatusLst()
+    },
+    get_table_dataEasStatusLst() {
+      this.easStatus.listLoading = true
+      GetDataByName(this.easStatus.getdataListParm).then(response => {
+        if (response.data.list !== null) {
+          this.easStatus.list = response.data.list
+        } else {
+          this.easStatus.list = []
+        }
+        this.easStatus.pageNum = response.data.pageNum
+        this.easStatus.pageSize = response.data.pageSize
+        if (response.data.total) {
+          this.easStatus.total = response.data.total
+        }
+      })
+      setTimeout(() => {
+        this.easStatus.listLoading = false
+      }, 100)
+    },
     handleClose(row) {
       MessageBox.confirm('是否确认关闭同步此数据?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
@@ -2953,4 +3129,4 @@ export default {
     line-height: 0;
   }
 
-</style>
+</style>

+ 226 - 35
src/views/custom/storage/index.vue

@@ -24,9 +24,14 @@
           <el-button v-waves class="filter-item" type="primary" icon="el-icon-search" @click="form_search">搜索</el-button>
           <div>
             <el-button v-if="isStorageAdd" class="filter-item" type="primary" icon="el-icon-edit" @click="form_add">新增</el-button>
+            <!-- <el-button v-if="isStorageTemplate" v-waves class="filter-item" type="info" icon="el-icon-tickets" @click="handleDownloadTemp"> 模板 </el-button> -->
             <el-upload style="display: inline-block;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImportExcel" :on-success="handleImportExcelSuccess">
               <el-button v-if="isStorageImport" v-waves class="filter-item" type="warning" icon="el-icon-download">导入</el-button>
             </el-upload>
+            <el-button v-if="isStorageExport" class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
+            <!-- <el-button v-if="isStorageExportEAS" class="filter-item" style="margin-left: 10px;" type="danger" icon="el-icon-upload2" @click="handleDownloadEas1">导出EAS</el-button> -->
+            <!-- <el-button v-if="isEasSynchronization" class="filter-item" type="primary" style="float: right;" @click="handleEAS">EAS同步</el-button> -->
+
             <el-button v-if="isStorageSap"  class="filter-item" style="margin-left: 10px;" type="success" icon="el-icon-upload2" @click="sapUpload">SAP上传</el-button>
           </div>
         </div>
@@ -93,7 +98,7 @@
               <template slot-scope="scope">
                 <span v-if="scope.row.ProofCode">已上传</span>
                 <span v-else>未上传</span>
-
+            
               </template>
             </el-table-column>
             <el-table-column   prop="sterilisation" label="冲销状态" min-width="80px" align="center">
@@ -140,7 +145,7 @@
           :cell-style="cellStyle"
           class="elTable table-fixed"
           @sort-change="tableSort"
-
+        
         >
           <el-table-column label="序号" align="center" type="index" width="50px">
             <template slot-scope="scope">
@@ -444,7 +449,7 @@
               <span  >{{ scope.row.price }}</span>
               <!-- <el-form v-if="isPriceInput" :model="scope.row" :rules="rules">
                 <el-form-item prop="price">
-                   <el-input ref="price" v-model="scope.row.price" :disabled="storage.laidType == 0" style="margin-top:15px" />
+                   <el-input ref="price" v-model="scope.row.price" :disabled="storage.laidType == 0" style="margin-top:15px" />  
                   <el-input ref="price" v-model="scope.row.price" style="margin-top:15px" />
                 </el-form-item>
               </el-form> -->
@@ -734,8 +739,8 @@ export default {
       isStorageSap:[],
 
       // --------------------------------------
-      isStorageAdd: [],  isStorageImport: [], isStorageExport: [], isStorageExportEAS: [], isStorageSee: [], isStorageDelete: [], isStorageMethod1: [], isStorageMethod2: [], isStorageMethod3: [],
-       isManualSynchronization: [], isCloseSynchronization: [], isIgnoreSynchronization: [],
+      isStorageAdd: [], isStorageTemplate: [], isStorageImport: [], isStorageExport: [], isStorageExportEAS: [], isStorageSee: [], isStorageDelete: [], isStorageMethod1: [], isStorageMethod2: [], isStorageMethod3: [],
+      isEasSynchronization: [], isManualSynchronization: [], isCloseSynchronization: [], isIgnoreSynchronization: [],
       rules: {
         providerId: [{ required: true, message: '必填', trigger: 'blur' }]
       },
@@ -980,8 +985,8 @@ export default {
             if(parseInt(i.reportery) > (parseInt(i.amount)-parseInt(i.receiveAmount))){
               i.reportery = parseInt(i.amount)-parseInt(i.receiveAmount)
             }
-
-          })
+                
+          })  
       }
     },
   },
@@ -1008,8 +1013,8 @@ export default {
     get_auto_buttons() {
       // 新增
 
-
-
+ 
+   
       const StorageSap = 'customs:storage:sap'
       const isStorageSap = checkButtons(this.$store.state.user.buttons, StorageSap)
       this.isStorageSap = isStorageSap
@@ -1018,6 +1023,10 @@ export default {
       const isStorageAdd = checkButtons(this.$store.state.user.buttons, StorageAdd)
       this.isStorageAdd = isStorageAdd
 
+      const StorageTemplate = 'customs:storage:template'
+      const isStorageTemplate = checkButtons(this.$store.state.user.buttons, StorageTemplate)
+      this.isStorageTemplate = isStorageTemplate
+
       const StorageImport = 'customs:storage:import'
       const isStorageImport = checkButtons(this.$store.state.user.buttons, StorageImport)
       this.isStorageImport = isStorageImport
@@ -1050,7 +1059,9 @@ export default {
       const isStorageMethod3 = checkButtons(this.$store.state.user.buttons, StorageMethod3)
       this.isStorageMethod3 = isStorageMethod3
 
-
+      const EasSynchronization = 'customs:storage:easSynchronization'
+      const isEasSynchronization = checkButtons(this.$store.state.user.buttons, EasSynchronization)
+      this.isEasSynchronization = isEasSynchronization
 
       const ManualSynchronization = 'customs:storage:manualSynchronization'
       const isManualSynchronization = checkButtons(this.$store.state.user.buttons, ManualSynchronization)
@@ -1988,33 +1999,33 @@ export default {
 
     checkboxInit(row,index){
       // console.log(row)
-      if(row.ProofCode){
-        return 0
+      if(row.ProofCode){ 
+        return 0 
       } else {
 
         var data1 = new Date(row.creatTime)
         var data2 = new Date('2022-10-25')
         if(data1 > data2){ return 1 } else {return 0}
-
+ 
       }
 
-
+ 
     },
 
-
+    
 
     //监听 - 表格 - 勾选
     change_table_selection(val) {
       this.selectList = val
       console.log('勾选数据selectList', this.selectList)
     },
-
+    
     sapUpload(){
 
 
+      
 
-
-      const that = this
+      const that = this 
       console.log("currentRow ProofCode",this.currentRow.ProofCode)
 
       var send_data = this.selectList
@@ -2031,25 +2042,25 @@ export default {
          that.isSap = 0
          SapLaid(send_data).then(response => {
               console.log('response', response)
-
+                
               if (response.msg !== 'fail') {
                 that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
                 that.selectList = []
                 that.get_table_data()
 
-
+                
                 } else {
                   that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
                 }
 
-
-
+               
+              
             })
 
-
+           
 
             console.log(that.isSap)
-
+            
       } else {
 
         that.$notify({ title: '失败', message: '正在请求中,请稍等几秒钟后再点击'  , type: 'error', duration: 2000 })
@@ -2064,40 +2075,40 @@ export default {
 
 
 
-
+     
 
       // //  if(true){
       // if(this.currentRow.ProofCode){
       //   //如果有这个值说明已经上传了,不用上传
       //   console.log("currentRow ProofCode 这个值说明已经上传了,不用上传")
-
+ 
       // } else {
       //   console.log("currentRow ProofCode没有这个值")
-      //     const laidCode = this.currentRow.laidCode
-      //     const creatTime = this.currentRow.creatTime
+      //     const laidCode = this.currentRow.laidCode 
+      //     const creatTime = this.currentRow.creatTime 
       //     console.log("laidCode",laidCode)
-
+ 
       //       console.log("laidCode",laidCode)
       //       var send_data = {
       //             "laidCode":laidCode,
       //             "storageTime":creatTime,
       //             "pastureid":Cookies.get('pastureid')
-
+              
       //       }
 
       //       SapLaid(send_data).then(response => {
       //         console.log('response', response)
-
+                
       //         if (response.msg !== 'fail') {
       //           that.$notify({ title: '成功', message: '上传成功', type: 'success', duration: 2000 })
       //           that.get_table_data()
-
+                
       //           } else {
       //             that.$notify({ title: '失败', message: '上传失败'  , type: 'error', duration: 2000 })
       //           }
-
+              
       //       })
-
+ 
       // }
 
     },
@@ -2218,6 +2229,58 @@ export default {
         })
       }
     },
+    handleDownload() {
+      console.log('点击了导出')
+      this.$alert('备件入库信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
+      this.isPercentage = true
+      this.percentage = 1
+      var timer = setInterval(() => {
+        this.percentage += 5
+        if (this.percentage > 95) {
+          this.percentage = 99
+          clearInterval(timer)
+        }
+        this.percentage = this.percentage
+      }, 1000)
+      this.requestParam.parammaps.formType = '备件入库信息'
+      this.requestParam.parammaps.inputDatetime = this.getdataListParm.parammaps.inputDatetime
+      this.requestParam.parammaps.pastureName = this.getdataListParm.parammaps.pastureName
+      this.requestParam.parammaps.laidCode = this.getdataListParm.parammaps.laidCode
+      this.requestParam.parammaps.laidType = this.getdataListParm.parammaps.laidType
+      this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
+      this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
+      GetAccount(this.requestParam).then(response => {
+        if (response.data.list !== '') {
+          this.percentage = 99
+          setTimeout(() => {
+            this.isPercentage = false
+          }, 2000)
+        }
+        if (response.data.list !== null) {
+          for (let i = 0; i < response.data.list.length; i++) {
+            this.$set(response.data.list[i], 'storageAmount', parseFloat(response.data.list[i].storageAmount))
+            this.$set(response.data.list[i], 'price', parseFloat(response.data.list[i].price))
+            this.$set(response.data.list[i], 'sumPrice', parseFloat(response.data.list[i].sumPrice))
+            if(response.data.list[i].sterilisation == 1){
+              this.$set(response.data.list[i], 'sterilisation', "已冲销")
+            } else {
+              this.$set(response.data.list[i], 'sterilisation', "未冲销")
+            } 
+          }
+        }
+        this.$nextTick(() => {
+          const ExcelDatas = [
+            {
+              tHeader: ['牧场', '入库单编号', '入库日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '数量', '单价', '总价', '库位', '供应商','冲销状态', 'error_msg'],
+              filterVal: ['pastureName', 'laidCode', 'creatTime', 'partCode', 'partName', 'specification', 'brandName', 'unit', 'storageAmount', 'price', 'sumPrice', 'warehoseCode', 'providerName', 'sterilisation', ''],
+              tableDatas: response.data.list,
+              sheetName: '备件入库信息'
+            }
+          ]
+          json2excel(ExcelDatas, '备件入库信息', true, 'xlsx')
+        })
+      })
+    },
     formatJson(filterVal, jsonData) {
       return jsonData.map(v =>
         filterVal.map(j => {
@@ -2245,6 +2308,110 @@ export default {
       console.log(item)
     },
 
+    // 导出模板
+    handleDownloadTemp() {
+      this.requestParam.name = 'stockLaidDownTemp'
+      GetDataByName(this.requestParam).then(response => {
+        this.$nextTick(() => {
+          import('@/vendor/Export2Excel').then(excel => {
+            const list1 = response.data.list
+            const tHeader = [
+              '牧场', '入库单编号', '入库日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '数量', '单价', '总价', '库位', '供应商'
+            ]
+            const filterVal = [
+              '牧场', '入库单编号', '入库日期', '物料编码', '品名', '规格型号', '品牌', '计量单位', '数量', '单价', '总价', '库位', '供应商'
+            ]
+            const data1 = this.formatJsonTemp(filterVal, list1)
+            excel.export_json_to_excel({
+              header: tHeader,
+              data: data1,
+              filename: '入库模板',
+              autoWidth: true,
+              bookType: 'xlsx'
+            })
+          })
+        })
+      })
+    },
+    formatJsonTemp(filterVal, jsonData) {
+      return jsonData.map(v =>
+        filterVal.map(j => {
+          if (j === 'timestamp') {
+            return parseTime(v[j])
+          } else {
+            return v[j]
+          }
+        })
+      )
+    },
+    handleDownloadEas1() {
+      this.$alert('备件入库EAS信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
+      this.isPercentage = true
+      this.percentage = 1
+      var timer = setInterval(() => {
+        this.percentage += 5
+        if (this.percentage > 95) {
+          this.percentage = 99
+          clearInterval(timer)
+        }
+        this.percentage = this.percentage
+      }, 1000)
+      this.requestParam.name = 'downloadPartLaidEASYuan'
+      this.requestParam.parammaps.inputDatetime = this.getdataListParm.parammaps.inputDatetime
+      this.requestParam.parammaps.pastureName = this.getdataListParm.parammaps.pastureName
+      this.requestParam.parammaps.laidCode = this.getdataListParm.parammaps.laidCode
+      this.requestParam.parammaps.laidType = this.getdataListParm.parammaps.laidType
+      this.requestParam.parammaps.startTime = this.getdataListParm.parammaps.startTime
+      this.requestParam.parammaps.stopTime = this.getdataListParm.parammaps.stopTime
+      GetAccount(this.requestParam).then(response => {
+        if (response.data.list !== '') {
+          this.percentage = 99
+          setTimeout(() => {
+            this.isPercentage = false
+          }, 2000)
+        }
+        this.$nextTick(() => {
+          import('@/vendor/Export2Excel').then(excel => {
+            if (response.data.list !== null) {
+              for (let i = 0; i < response.data.list.length; i++) {
+                this.$set(response.data.list[i], '数量', parseFloat(response.data.list[i]['数量']))
+                this.$set(response.data.list[i], '总价', parseFloat(response.data.list[i]['总价']))
+                this.$set(response.data.list[i], '单价', parseFloat(response.data.list[i]['单价']))
+              }
+            }
+            const list1 = response.data.list
+            console.log(list1)
+            const tHeader = [
+              '牧场', '入库单编号', '入库日期', '供应商编码', '供应商', '入库人', '制单日期', '品名', '物料编码', '计量单位', '单价', '数量', '总价', '备注'
+            ]
+            const filterVal = [
+              '牧场', '入库单编号', '入库日期', '供应商编码', '供应商', '入库人', '制单日期', '品名', '物料编码', '计量单位', '单价', '数量', '总价', '备注'
+            ]
+
+            // const tmerges=['B1:D2']
+            if (list1 !== null) {
+              const data1 = this.formatJsonTemp(filterVal, list1)
+              excel.export_json_to_excel({
+                // merges: tmerges,
+                // multiHeader: tmultiHeader,
+                header: tHeader,
+                data: data1,
+                filename: '备件入库EAS:',
+                autoWidth: true,
+                bookType: 'xlsx'
+              })
+            } else {
+              this.$notify({
+                title: '',
+                message: '无备件领用完成信息,无法导出!',
+                type: 'warning',
+                duration: 2000
+              })
+            }
+          })
+        })
+      })
+    },
     // 导出
     handleDownloadEas() {
       this.$alert('备件入库EAS信息正在导出中,请勿刷新或离开本页面,若导出时间过长,建议缩小导出数据范围重新导出', {})
@@ -2346,6 +2513,30 @@ export default {
       })
     },
 
+    handleEAS() {
+      this.easStatus.dialogStatus = 'easStatus'
+      this.easStatus.dialogFormVisible = true
+      this.get_table_dataEasStatusLst()
+    },
+    get_table_dataEasStatusLst() {
+      this.easStatus.listLoading = true
+      GetDataByName(this.easStatus.getdataListParm).then(response => {
+        if (response.data.list !== null) {
+          this.easStatus.list = response.data.list
+        } else {
+          this.easStatus.list = []
+        }
+        this.easStatus.pageNum = response.data.pageNum
+        this.easStatus.pageSize = response.data.pageSize
+        if (response.data.total) {
+          this.easStatus.total = response.data.total
+        }
+      })
+      setTimeout(() => {
+        this.easStatus.listLoading = false
+      }, 100)
+    },
+
     handleClose(row) {
       MessageBox.confirm('是否确认关闭同步此数据?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
@@ -2433,4 +2624,4 @@ export default {
   .el-radio{
     margin-right: 5px;
   }
-</style>
+</style>

+ 112 - 39
src/views/report/cattle/index.vue

@@ -243,6 +243,7 @@ export default {
       GetReportform(this.getBarChart1Parm).then(response => {
         console.log('图1', response)
         this.chart_data1 = response.data.chart_data
+        this.chart_data1.standard = '3'
         this.roadBarChart1(this.chart_data1)
         var nowYear = response.data.chart_data.nowYear
         var total = 0
@@ -260,6 +261,7 @@ export default {
       GetReportform(this.getBarChart2Parm).then(response => {
         console.log('图2', response)
         this.chart_data2 = response.data.chart_data
+        this.chart_data2.standard = '0.3'
         this.roadBarChart2(this.chart_data2)
         var nowYear = response.data.chart_data.nowYear
         var total = 0
@@ -277,6 +279,7 @@ export default {
       GetReportform(this.getBarChart3Parm).then(response => {
         console.log('图3', response)
         this.chart_data3 = response.data.chart_data
+        this.chart_data3.standard = '3'
         this.roadBarChart3(this.chart_data3)
         var nowYear = response.data.chart_data.nowYear
         var total = 0
@@ -294,6 +297,7 @@ export default {
       GetReportform(this.getBarChart4Parm).then(response => {
         console.log('图4', response)
         this.chart_data4 = response.data.chart_data
+         this.chart_data4.standard = '0.3'
         this.roadBarChart4(this.chart_data4)
         var nowYear = response.data.chart_data.nowYear
         var total = 0
@@ -311,6 +315,7 @@ export default {
       GetReportform(this.getBarChart5Parm).then(response => {
         console.log('图5', response)
         this.chart_data5 = response.data.chart_data
+        this.chart_data5.standard = '0.3'
         this.roadBarChart5(this.chart_data5)
         var nowYear = response.data.chart_data.nowYear
         var total = 0
@@ -392,7 +397,21 @@ export default {
             name: '实际费用',
             type: 'bar',
             data: chart_data1.nowYear,
-            emphasis: { label: { show: true, position: 'inside' }}
+            emphasis: { label: { show: true, position: 'inside' }},
+            markLine: {//图表标线
+              data: [{
+                lineStyle:{
+                    color:'#FFB800'
+                },
+                label: {
+                    position: 'end', // 表现内容展示的位置
+                    formatter: '标准线',  // 标线展示的内容
+                    color: '#FFB800'  // 展示内容颜色
+                  },
+                yAxis: chart_data1.standard
+
+              }],
+            }
           },
           // {
           //   name: '预算',
@@ -400,12 +419,12 @@ export default {
           //   data: chart_data1.budgetYear,
           //   emphasis: { label: { show: true, position: 'inside' }}
           // },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data1.lastYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          }
+          // {
+          //   name: '去年同期',
+          //   type: 'bar',
+          //   data: chart_data1.lastYear,
+          //   emphasis: { label: { show: true, position: 'inside' }}
+          // }
         ]
       }
       this.barChart1.setOption(option)
@@ -449,20 +468,33 @@ export default {
             name: '实际费用',
             type: 'bar',
             data: chart_data2.nowYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          },
+            emphasis: { label: { show: true, position: 'inside' }},
+            markLine: {//图表标线
+              data: [{
+                lineStyle:{
+                    color:'#FFB800'
+                },
+                label: {
+                    position: 'end', // 表现内容展示的位置
+                    formatter: '标准线',  // 标线展示的内容
+                    color: '#FFB800'  // 展示内容颜色
+                  },
+                yAxis: chart_data2.standard
+              }]
+            }
+          }
           // {
           //   name: '预算',
           //   type: 'bar',
           //   data: chart_data2.budgetYear,
           //   emphasis: { label: { show: true, position: 'inside' }}
           // },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data2.lastYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          }
+          // {
+          //   name: '去年同期',
+          //   type: 'bar',
+          //   data: chart_data2.lastYear,
+          //   emphasis: { label: { show: true, position: 'inside' }}
+          // }
 
         ]
       }
@@ -502,20 +534,33 @@ export default {
             name: '实际费用',
             type: 'bar',
             data: chart_data3.nowYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          },
+            emphasis: { label: { show: true, position: 'inside' }},
+            markLine: {//图表标线
+              data: [{
+                lineStyle:{
+                    color:'#FFB800'
+                },
+                label: {
+                    position: 'end', // 表现内容展示的位置
+                    formatter: '标准线',  // 标线展示的内容
+                    color: '#FFB800'  // 展示内容颜色
+                  },
+                yAxis: chart_data3.standard
+              }],
+            }
+          }
           // {
           //   name: '预算',
           //   type: 'bar',
           //   data: chart_data3.budgetYear,
           //   emphasis: { label: { show: true, position: 'inside' }}
           // },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data3.lastYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          }
+          // {
+          //   name: '去年同期',
+          //   type: 'bar',
+          //   data: chart_data3.lastYear,
+          //   emphasis: { label: { show: true, position: 'inside' }}
+          // }
 
         ]
       }
@@ -555,20 +600,34 @@ export default {
             name: '实际费用',
             type: 'bar',
             data: chart_data4.nowYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          },
+            emphasis: { label: { show: true, position: 'inside' }},
+            markLine: {//图表标线
+              data: [{
+                lineStyle:{
+                    color:'#FFB800'
+                },
+                label: {
+                    position: 'end', // 表现内容展示的位置
+                    formatter: '标准线',  // 标线展示的内容
+                    color: '#FFB800'  // 展示内容颜色
+                  },
+                yAxis: chart_data4.standard
+
+              }],
+            }
+          }
           // {
           //   name: '预算',
           //   type: 'bar',
           //   data: chart_data4.budgetYear,
           //   emphasis: { label: { show: true, position: 'inside' }}
           // },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data4.lastYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          }
+          // {
+          //   name: '去年同期',
+          //   type: 'bar',
+          //   data: chart_data4.lastYear,
+          //   emphasis: { label: { show: true, position: 'inside' }}
+          // }
 
         ]
       }
@@ -608,20 +667,34 @@ export default {
             name: '实际费用',
             type: 'bar',
             data: chart_data5.nowYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          },
+            emphasis: { label: { show: true, position: 'inside' }},
+            markLine: {//图表标线
+              data: [{
+                lineStyle:{
+                    color:'#FFB800'
+                },
+                label: {
+                    position: 'end', // 表现内容展示的位置
+                    formatter: '标准线',  // 标线展示的内容
+                    color: '#FFB800'  // 展示内容颜色
+                  },
+                yAxis: chart_data5.standard
+              }],
+            }
+          }
+
           // {
           //   name: '预算',
           //   type: 'bar',
           //   data: chart_data5.budgetYear,
           //   emphasis: { label: { show: true, position: 'inside' }}
           // },
-          {
-            name: '去年同期',
-            type: 'bar',
-            data: chart_data5.lastYear,
-            emphasis: { label: { show: true, position: 'inside' }}
-          }
+          // {
+          //   name: '去年同期',
+          //   type: 'bar',
+          //   data: chart_data5.lastYear,
+          //   emphasis: { label: { show: true, position: 'inside' }}
+          // }
 
         ]
       }

+ 4 - 4
src/views/report/inventorySummary/index.vue

@@ -34,11 +34,11 @@
           </template>
         </el-table-column>
         <el-table-column label="库存标准" min-width="140px" align="center" sortable prop="standard" />
-        <el-table-column label="实际库存" min-width="140px" align="center" sortable prop="psCount" />
-        <el-table-column label="差异" min-width="140px" align="center" sortable prop="different" />
+        <el-table-column label="实际库存" min-width="140px" align="center" sortable prop="psCountje" />
+        <el-table-column label="差异" min-width="140px" align="center" sortable prop="differentje" />
         <el-table-column label="出库金额" min-width="140px" align="center" sortable prop="ckje" />
-        <el-table-column label="期初库存" min-width="140px" align="center" sortable prop="earlymonth" />
-        <el-table-column label="期末库存" min-width="140px" align="center" sortable prop="endofmonth" />
+        <el-table-column label="期初库存" min-width="140px" align="center" sortable prop="earlymonthje" />
+        <el-table-column label="期末库存" min-width="140px" align="center" sortable prop="endofmonthje" />
         <el-table-column label="库存周转率" min-width="140px" align="center" sortable prop="rateofturnover" />  
       </el-table>
       <pagination v-show="total>0" :total="total" :page.sync="getdataListParm.offset" :limit.sync="getdataListParm.pagecount" @pagination="get_table_data" />

+ 1 - 0
src/views/report/maintenanceCycle/index.vue

@@ -91,6 +91,7 @@
       <el-table-column label="设备名称" min-width="90px" align="center" prop="eqName" />
       <el-table-column label="设备内部编号" min-width="90px" align="center" prop="eqCode" />
       <el-table-column label="报修日期" min-width="70px" align="center" prop="BXTime" />
+      <el-table-column label="报修人" min-width="70px" align="center" prop="BXname" />
       <el-table-column label="接单间隔" min-width="90px" sortable align="center" prop="BxAndJd" />
       <el-table-column label="接单日期" min-width="90px" sortable align="center" prop="JDTime" />
       <el-table-column label="维修人" min-width="70px" sortable align="center" prop="pickname" />

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

@@ -83,15 +83,15 @@
       <el-table-column label="备件编号" min-width="90px" align="center" prop="partCode" />
       <el-table-column label="申购单号" min-width="90px" align="center" prop="SGCode" />
       <el-table-column label="申购日期" min-width="90px" align="center" prop="SGdate" />
-      <el-table-column label="天数" min-width="70px" align="center" prop="SGDays" />
       <el-table-column label="配单号" min-width="90px" align="center" prop="PDCode" />
       <el-table-column label="配单日期" min-width="90px" align="center" prop="PDdate" />
-      <el-table-column label="天数" min-width="70px" align="center" prop="PDDays" />
+      <el-table-column label="申购-配单天数" min-width="70px" align="center" prop="SGDays" />
       <el-table-column label="采购单号" min-width="90px" align="center" prop="CGCode" />
       <el-table-column label="采购日期" min-width="90px" align="center" prop="CGdate" />
-      <el-table-column label="天数" min-width="70px" align="center" prop="CGDays" />
+      <el-table-column label="配单-采购天数" min-width="70px" align="center" prop="PDDays" />
       <el-table-column label="入库单号" min-width="90px" align="center" prop="RKCode" />
       <el-table-column label="入库日期" min-width="90px" align="center" prop="RKdate" />
+      <el-table-column label="采购-入库天数" min-width="70px" align="center" prop="CGDays" />
     </el-table>
     <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="get_table_data" />
   </div>

+ 3 - 2
src/views/report/stopRecord/index.vue

@@ -45,7 +45,7 @@
         :row-style="rowStyle"
         :cell-style="tableCellStyle"
         class="elTable"
- 
+        :max-height="myHeight"
       >
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
@@ -130,7 +130,8 @@ export default {
       percentage: 1,
       isokDisable: false,
       rowStyle: { maxHeight: 50 + 'px', height: 45 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150
     }
   },
   created() {

Some files were not shown because too many files changed in this diff