Merge branch 'master' of http://kpt.kptyun.cn:3000/duanxiaoduan/tmr-admin

src/views/basicData/feedTable/index.vue

@@ -47,9 +47,9 @@
         <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
       </div>
 
-      <!-- 注释内容后续版本更 -->
+      
 
-      <!-- <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
+      <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
       <el-dropdown style="float: right;margin-right: 10px;">
@@ -58,9 +58,9 @@
           <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
           <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
         </el-dropdown-menu>
-      </el-dropdown> -->
+      </el-dropdown>
 
-     <!-- 注释内容后续版本更 -->
+  
 
     </div>
 
@@ -77,7 +77,7 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         row-key="id"
         @selection-change="handleSelectionChange"
       >
@@ -707,6 +707,7 @@ import Cookies from 'js-cookie'
 import Sortable from 'sortablejs'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
+import { parseTime, json2excel, handleTableSpan, handleObjectSpanMethod } from '@/utils/index.js'
 import { MessageBox } from 'element-ui'
 export default {
   name: 'FeedTable',
@@ -737,6 +738,27 @@ export default {
       dialogFull: false,
       isInforvalue: false,
       isRoleEdit: [],
+      download: {
+        getdataListParm: {
+          name: 'getFeedList',
+          page: 1,
+          offset: 1,
+          pagecount: 0,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            fname: '',
+            fclassid: '',
+            source: '',
+            autozone: '',
+            autosecond: '',
+            allowratio: '',
+            printgroup: '',
+            enable: ''
+          }
+        },
+        list: []
+      },
       requestParams: [
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['跳转延时'] },
         { name: 'getFeedclassByBig', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
@@ -964,48 +986,77 @@ export default {
     },
     handleExport(item) {
       if (item == 1) {
+
         console.log('点击了导出模板')
-        const requestParam = this.requestParam
-        const url = process.env.VUE_APP_BASE_API + 'file/导入导出模板/库存管理/饲料合同导入模板.xlsx' // 请求下载文件的地址
-        console.log(url)
-        axios({
-          method: 'GET',
-          url: url,
-          data: requestParam,
-          headers: { token: getToken(), optname: 'insertcustomdoc' },
-          responseType: 'blob'
-        }).then(res => {
-          if (!res) return
-          this.percentage = 99
-          setTimeout(() => {
-            this.isPercentage = false
-          }, 2000)
-          const blob = new Blob([res.data], {
-            type: 'application/octet-stream;charset=utf-8'
-          })
-          const url = window.URL.createObjectURL(blob)
-          const aLink = document.createElement('a')
-          aLink.style.display = 'none'
-          aLink.href = url
-          const docname = '饲料表导入模板.xlsx'
-          aLink.setAttribute('download', docname) // 下载的文件
-          document.body.appendChild(aLink)
-          aLink.click()
-          document.body.removeChild(aLink)
-          window.URL.revokeObjectURL(url)
+        this.download.getdataListParm.parammaps = this.table.getdataListParm.parammaps
+        GetDataByName(this.download.getdataListParm).then(response => {
+          if (response.data.list !== null) {
+            this.download.list = response.data.list
+          } else {
+            this.download.list = []
+          }
+          var downloadList = [
+            { 'obj1': '1、文件类型为xlsx类型，对应表格文件名格式为：文件名称.xlsx；' },
+            { 'obj1': '2、底部工作表名称不可更改，默认为：Sheet1；' },
+            // { 'obj1': '3、栏舍名称,实际牛头数,系数（%）,系数头数,配方模板,补料配方字体为必填；' },
+            // { 'obj1': '4、第一列栏舍名称默认为系统中栏舍，不可修改；' },
+            // { 'obj1': '5、实际牛头数为正整数，系数为正数，至多保留俩位小数；' },
+            // { 'obj1': '6、配方模板名称必须与系统中配方计划—配方模板中的饲喂配方匹配；若补料配方开启，需与配方模板中的补料配方匹配；' },
+            // { 'obj1': '7、数据最多可导入200条，超过200条请分多个文件导入。' }
+          ]
+          var excelDatas = [
+            {
+              tHeader: [
+               '饲料名称', '饲料分类', '唯一编码', '计划类型', '允许误差数（kg）', '包装单位重量(kg)', '单价', '跳转重量域(kg)', '跳转延时', '确认开始', '继电器位置', '无上域', '备用字段01', '备用字段02', '备用字段03'
+             ],
+              filterVal:  ['fname', 'fclass', 'feedcode', '', '', '', '', '', '', '', '', '', '', '', '', ''],
+              tableDatas: this.download.list,
+              sheetName: 'Sheet1'
+            }, {
+              tHeader: ['填写规范:'],
+              filterVal: ['obj1'],
+              tableDatas: downloadList,
+              sheetName: 'Sheet2'
+            }
+          ]
+          json2excel(excelDatas, '饲料表导入模板', true, 'xlsx')
         })
+
+
+        // console.log('点击了导出模板')
+        // const requestParam = this.requestParam
+        // const url = process.env.VUE_APP_BASE_API + 'file/导入导出模板/库存管理/饲料合同导入模板.xlsx' // 请求下载文件的地址
+        // console.log(url)
+        // axios({
+        //   method: 'GET',
+        //   url: url,
+        //   data: requestParam,
+        //   headers: { token: getToken(), optname: 'insertcustomdoc' },
+        //   responseType: 'blob'
+        // }).then(res => {
+        //   if (!res) return
+        //   this.percentage = 99
+        //   setTimeout(() => {
+        //     this.isPercentage = false
+        //   }, 2000)
+        //   const blob = new Blob([res.data], {
+        //     type: 'application/octet-stream;charset=utf-8'
+        //   })
+        //   const url = window.URL.createObjectURL(blob)
+        //   const aLink = document.createElement('a')
+        //   aLink.style.display = 'none'
+        //   aLink.href = url
+        //   const docname = '饲料表导入模板.xlsx'
+        //   aLink.setAttribute('download', docname) // 下载的文件
+        //   document.body.appendChild(aLink)
+        //   aLink.click()
+        //   document.body.removeChild(aLink)
+        //   window.URL.revokeObjectURL(url)
+        // })
       } else {
         console.log('点击了导出数据')
-        this.download.getdataListParm.name = 'DownloadContractList'
         this.download.getdataListParm.parammaps = this.table.getdataListParm.parammaps
-        if (this.download.getdataListParm.parammaps.inputDatetime !== '' && this.download.getdataListParm.parammaps.inputDatetime !== null) {
-          this.download.getdataListParm.parammaps.startTime = parseTime(this.download.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-          this.download.getdataListParm.parammaps.stopTime = parseTime(this.download.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-        } else {
-          this.download.getdataListParm.parammaps.inputDatetime = ''
-          this.download.getdataListParm.parammaps.startTime = ''
-          this.download.getdataListParm.parammaps.stopTime = ''
-        }
+       
         GetDataByName(this.download.getdataListParm).then(response => {
           if (response.data.list !== null) {
             this.download.list = response.data.list
@@ -1022,7 +1073,7 @@ export default {
               sheetName: 'Sheet1'
             }
           ]
-          json2excel(excelDatas, '饲料合同', true, 'xlsx')
+          json2excel(excelDatas, '饲料表', true, 'xlsx')
         })
       }
     },

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -78,7 +78,49 @@
     
 
 
-    
+     <el-dialog :fullscreen="dialogFull" :visible.sync="create1.dialogFormVisible" :close-on-click-modal="false" width="50%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            推料计划
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="app-add">
+        <el-form ref="temp" :rules="create1.rules" :model="create1.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
+       
+           
+          <el-row>
+              <el-col :span="6">
+                <el-form-item label="设置时间：" prop="useinbarid">
+                   <el-time-picker
+                    v-model="value1"
+                    :picker-options="{
+                      selectableRange: '00:00:00 - 23:59:59'
+                    }"
+                    placeholder="任意时间点">
+                  </el-time-picker>
+                </el-form-item>
+              </el-col>
+
+          </el-row>
+
+ 
+  
+
+       
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelClose" @click="create1.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button class="save"  @click="handleCreate">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
  
     
   </div>
@@ -100,6 +142,8 @@ export default {
   components: { Pagination, Pagination2 },
   data() {
     return {
+
+      value1: new Date(2016, 9, 10, 18, 40),
       dialogFull: false,
       isRoleEdit: [],
       headerList: [],
@@ -281,6 +325,9 @@ export default {
       this.create1.dialogStatus = 'create'
       this.create1.dialogFormVisible = true
     },
+     resetTemp1() {
+      this.create1.temp = { pastureid: Cookies.get('pastureid'), 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'sort': "", 'ftid': '', 'ftname': '', 'tmrcode': '', 'tmrid': '', 'times': '', 'lppcode': '', 'lppid': '', 'rtime': '', barid: '', 'treatmethod': '', 'useinbar': '', 'useinbarid': '' }
+    },
 
 
 

src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -3,11 +3,10 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="效率统计" name="first">
         <div class="search">
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
-        
-
-<!-- 等待对接中…… -->
-        <!-- <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/> -->
+          <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-if="false"/>
+         
+ 
+        <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
         
           <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
@@ -449,6 +448,9 @@ export default {
             parammaps: {
               pastureid: Cookies.get('pastureid'),
               date: parseTime(new Date(), '{y}-{m}-{d}'),
+              startTime: parseTime(new Date(), '{y}-{m}-{d}'),
+              stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+               inputDatetime: [new Date(), new Date()],
               ftname: '',
               barname: '',
               cowclass: ''
@@ -714,8 +716,8 @@ export default {
 
     
     change_date(e){
-      console.log(e)
-      this.getDownList()
+      this.downTMR.parammaps.startdate = this.table.getdataListParm.parammaps.startTime
+      this.downTMR.parammaps.enddate = this.table.getdataListParm.parammaps.stopTime
     },
 
     // getDownList() {
@@ -805,6 +807,8 @@ export default {
         const start2 = new Date()
         start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
         this.tab.table.getdataListParm.parammaps.date = parseTime(start2, '{y}-{m}-{d}')
+        this.tab.table.getdataListParm.parammaps.startTime = parseTime(start2, '{y}-{m}-{d}')
+        this.tab.table.getdataListParm.parammaps.stopTime = parseTime(start2, '{y}-{m}-{d}')
         this.getTabList()
         this.getChart1()
         this.getChart2()
@@ -815,6 +819,8 @@ export default {
         const start2 = new Date()
         start2.setTime(start2.getTime() - 3600 * 1000 * 24 * 1)
         this.tab2.table.getdataListParm.parammaps.date = parseTime(start2, '{y}-{m}-{d}')
+          this.tab.table.getdataListParm.parammaps.startTime = parseTime(start2, '{y}-{m}-{d}')
+        this.tab.table.getdataListParm.parammaps.stopTime = parseTime(start2, '{y}-{m}-{d}')
         this.getTab2List()
         this.getTab2List2()
         this.getTab2List3()
@@ -916,22 +922,66 @@ export default {
         this.getTabList()
       }
     },
+    // handleBefore() {
+    //   if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
+    //     this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
+    //     var start = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() - 1))
+    //     this.tab.table.getdataListParm.parammaps.date = parseTime(start, '{y}-{m}-{d}')
+    //     this.getTabList()
+    //   }
+    // },
+ 
+
     handleBefore() {
-      if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
-        this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
-        var start = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() - 1))
-        this.tab.table.getdataListParm.parammaps.date = parseTime(start, '{y}-{m}-{d}')
-        this.getTabList()
+      if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        // if (stop > Date.now()) {
+        //   this.Nextdisabled = true
+        //   this.Beforedisabled = false
+        // } else {
+        //   this.Nextdisabled = false
+        //   this.Beforedisabled = false
+        // }
+        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+        this.$forceUpdate()
       }
+      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+     
+      this.getTabList()
     },
     handleNext() {
-      if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
-        this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
-        var stop = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() + 1))
-        this.tab.table.getdataListParm.parammaps.date = parseTime(stop, '{y}-{m}-{d}')
-        this.getTabList()
+       if (this.tab.table.getdataListParm.parammaps.inputDatetime !== '' && this.tab.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop = new Date(this.tab.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.tab.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        // if (stop > Date.now()) {
+        //   this.Nextdisabled = true
+        //   this.Beforedisabled = false
+        // } else {
+        //   this.Nextdisabled = false
+        //   this.Beforedisabled = false
+        // }
+        this.tab.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.tab.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+        this.$forceUpdate()
       }
+      this.tab.table.getdataListParm.parammaps.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.tab.table.getdataListParm.parammaps.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+     
+      this.getTabList()
     },
+
+
+    // handleNext() {
+    //   if (this.tab.table.getdataListParm.parammaps.date !== '' && this.tab.table.getdataListParm.parammaps.date !== null) {
+    //     this.tab.table.getdataListParm.parammaps.date = new Date(this.tab.table.getdataListParm.parammaps.date)
+    //     var stop = new Date(this.tab.table.getdataListParm.parammaps.date.setDate(this.tab.table.getdataListParm.parammaps.date.getDate() + 1))
+    //     this.tab.table.getdataListParm.parammaps.date = parseTime(stop, '{y}-{m}-{d}')
+    //     this.getTabList()
+    //   }
+    // },
     handleBefore2() {
       if (this.tab2.table.getdataListParm.parammaps.date !== '' && this.tab2.table.getdataListParm.parammaps.date !== null) {
         this.tab2.table.getdataListParm.parammaps.date = new Date(this.tab2.table.getdataListParm.parammaps.date)

src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -3,6 +3,7 @@
     <!-- <h1>牧场</h1> -->
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
+      
       <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
       <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="计划类型" class="filter-item" style="width: 120px;" clearable>