更新5-9

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -1,20 +1,20 @@
  <template>
   <div class="app-container">
     <div class="operation">
-   
+
 
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate1">设置推料时间</el-button>
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate2">设置允许误差时间</el-button>
 
-      
+
      <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect">启用</el-button>
       <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable">禁用</el-button>
       <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
 
       <el-button class="import" style="float: right;" @click="handleHistoryRecords">历史记录</el-button>
- 
+
     </div>
- 
+
     <div class="table">
       <el-table
         :key="table.tableKey"
@@ -29,19 +29,19 @@
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
-        :max-height="myHeight"
         @header-click="headerClick"
         @cell-click="cellClick"
         @selection-change="handleSelect"
         @cell-dblclick="celldblclick"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" width="50" />
         <el-table-column :key="1" label="序号" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left" />
         <el-table-column label="栏舍名称" min-width="100px" align="center" class-name="small-padding fixed-width" fixed="left">
           <template slot-scope="scope">
-        
+
             <span  >{{ scope.row.bname }}</span>
- 
+
           </template>
         </el-table-column>
         <el-table-column :key="2" label="推料车名称" min-width="70px" align="center">
@@ -49,31 +49,31 @@
             <span v-if="scope.row.NoEdit">{{ scope.row.tmrname }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.tmrid" filterable placeholder="推料车名称" class="filter-item" style="width:95%;padding:10px 0;" @change="changeTmrCode(scope.$index, scope.row, $event)">
                   <el-option v-for="item in tmrCodeList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>  
+            </el-select>
           </template>
         </el-table-column>
         <el-table-column :key="3" label="推料车编号" min-width="90px" align="center">
           <template slot-scope="scope">
             <span  >{{ scope.row.tmrcode }}</span>
-      
+
           </template>
         </el-table-column>
         <el-table-column :key="4" label="推料时间(每天)" min-width="85px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.times }}</span>
-            
+
             <el-tag v-if="scope.row.Edit" v-for="tag  in  scope.row.timesArr" :key="tag" closable @close="tag_close(scope.$index, scope.row, tag)" type="success">{{tag}}</el-tag>
 
-          
-                   <el-time-picker v-if="scope.row.Edit" 
+
+                   <el-time-picker v-if="scope.row.Edit"
                      v-model="scope.row.times"
                     :picker-options="{ selectableRange: '00:00:00 - 23:59:59' }"
                      value-format="HH:mm"
                      @change="change_time(scope.$index, scope.row, $event)" format="HH:mm"
                     placeholder="任意时间点">
                   </el-time-picker>
-     
-         
+
+
           </template>
         </el-table-column>
         <el-table-column :key="5" label="允许误差时间(分钟)" min-width="85px" align="center">
@@ -102,9 +102,10 @@
           </template>
         </el-table-column>
       </el-table>
+      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
       <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
     </div>
-    
+
 
 
      <el-dialog :fullscreen="dialogFull" :visible.sync="create1.dialogFormVisible" :close-on-click-modal="false" width="50%">
@@ -122,7 +123,7 @@
       </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">
@@ -142,7 +143,7 @@
 
             </el-row>
 
-        
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create1.dialogFormVisible = false;getList()">关闭</el-button>
@@ -167,7 +168,7 @@
       </template>
       <div class="app-add">
         <el-form ref="temp" :rules="create2.rules" :model="create2.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
-        
+
           <el-row>
               <el-col :span="12">
               <el-form-item label="允许误差时间(分钟)：" prop="allowableerror">
@@ -176,9 +177,9 @@
             </el-col>
 
           </el-row>
-           
 
-        
+
+
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create2.dialogFormVisible = false;getList()">关闭</el-button>
@@ -239,7 +240,7 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
           >
- 
+
             <el-table-column label="栏舍名称" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.barname }}</span>
@@ -255,8 +256,8 @@
                 <span>{{ scope.row.tmrcode }}</span>
               </template>
             </el-table-column>
-  
-            
+
+
             <el-table-column label="推料时间（每天）" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.tisms }}</span>
@@ -267,7 +268,7 @@
                 <span>{{ scope.row.allowableerror }}</span>
               </template>
             </el-table-column>
-           
+
           </el-table>
           <pagination v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset" :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" />
         </div>
@@ -276,9 +277,9 @@
         <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
       </div>
     </el-dialog>
-    
- 
-    
+
+
+
   </div>
 </template>
 
@@ -291,7 +292,7 @@ import { MessageBox } from 'element-ui'
 import Cookies from 'js-cookie'
 import axios from 'axios'
 import { getToken } from '@/utils/auth'
- 
+
 export default {
   inject: ['reload'],
   name: 'PushMaterialPlan',
@@ -342,12 +343,12 @@ export default {
           name: 'getPushingList',
           page: 1,
           offset: 1,
- 
+
           pagecount: '',
           returntype: 'Map',
           parammaps: {
             pastureid: Cookies.get('pastureid'),
-         
+
           }
         },
         tableKey: 0,
@@ -355,8 +356,8 @@ export default {
         total: 0,
         listLoading: true,
         temp: {},
-  
- 
+
+
       },
 
 
@@ -416,16 +417,16 @@ export default {
       isRoleEdit: [],
       headerList: [],
       pickerMinDate: '',
- 
-   
+
+
       rules: {
         cowclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
       },
-      
+
       selectList: [],
-   
-   
-       
+
+
+
 
       requestParam: {},
       download: {
@@ -448,26 +449,26 @@ export default {
       isokDisable: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
-      myHeight: document.documentElement.clientHeight - 85 - 140,
+      myHeight: document.documentElement.clientHeight - 85- 150,
       oldRowList:{},
 
 
-      
+
 
 
 
     }
   },
   computed: {
-    
-    
+
+
   },
   created() {
     this.getButtons()
 
     this.getTMRlist()
     this.getList()
-   
+
   },
 
   methods: {
@@ -501,7 +502,7 @@ export default {
             this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
             this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
             this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
-           
+
           }
 
           response.data.list.forEach(function(item){
@@ -513,15 +514,15 @@ export default {
           })
 
           // console.log(response.data.list, sumr)
-      
+
           this.table.list = response.data.list
           console.log(this.table.list, 'this.table.list')
           this.table.pageNum = response.data.pageNum
           this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
         } else {
           this.table.list = []
         }
+        this.table.total = response.data.total
         setTimeout(() => {
           this.table.listLoading = false
         }, 100)
@@ -533,15 +534,15 @@ export default {
     changeTmrCode(index,row,item) {
       console.log("推料车:====",index,row,item)
       var Code   = this.tmrCodeList.find(obj => obj.id === row.tmrid).Code
-      var itemName   = this.tmrCodeList.find(obj => obj.id === row.tmrid).name 
+      var itemName   = this.tmrCodeList.find(obj => obj.id === row.tmrid).name
       console.log( "推料车编号:====",Code , itemName)
       this.table.list[index].tmrcode = Code
       this.table.list[index].tmrname = itemName
-      
+
     },
-     
 
-  
+
+
 
      // 新增
     handleCreate1() {
@@ -555,13 +556,13 @@ export default {
         this.create1.dialogStatus = 'create'
         this.create1.dialogFormVisible = true
       }
-    
+
 
     },
      resetTemp1() {
       this.timetags1 = []
     },
-    
+
 
     create_sure1(){
         console.log('timetags1-----',this.timetags1)
@@ -581,7 +582,7 @@ export default {
             selectArr.forEach(function(item){
               timeArrRea.forEach(function(items){
                 timeIdArr.push({"time":items,"tmrname":item.tmrname,"tmrid":item.tmrid,"id":item.id})
-              }) 
+              })
             })
 
 
@@ -624,7 +625,7 @@ export default {
                   },
 										 "children":[{"name":"insertPushingDetailByPushingId","type":"e","parammaps":
 										 {"pastureid":Cookies.get('pastureid'),"id":"@insertPushingDetail.id","time":"@insertPushingDetail.time","type":0}}]}
-										 ]} 
+										 ]}
 
 
 
@@ -637,25 +638,25 @@ export default {
                   if (response.msg === 'fail') {
                     this.$notify({ title: '设置失败', message: response.data, type: 'warning', duration: 2000 })
                   } else {
-                    
+
                     this.$notify({ title: '设置成功', message: '设置成功', type: 'success', duration: 2000 })
                     this.create1.dialogFormVisible = false
                     this.getList()
-                    
+
                   }
                 })
           } else {
              this.$notify({ title: '设置失败', message: response.data, type: 'warning', duration: 2000 })
-          
+
           }
         })
-   
 
-       
+
+
     },
 
     handleCreate2() {
- 
+
 
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择推料信息', duration: 2000 })
@@ -688,26 +689,26 @@ export default {
         if (response.msg === 'fail') {
                 this.$notify({ title: '设置失败', message: response.data, type: 'warning', duration: 2000 })
               } else {
-                
+
                 this.$notify({ title: '设置成功', message: '设置成功', type: 'success', duration: 2000 })
                 this.create2.dialogFormVisible = false
                 this.getList()
-                
+
               }
       })
     },
 
 
 
- 
-    
-    
-    
+
+
+
+
 
     change_time1(tag){
       console.log("tag", tag)
         console.log("timetags1", this.timetags1)
-  
+
      this.timetags1.push(tag)
 
     },
@@ -719,23 +720,23 @@ export default {
         console.log("tag", tag)
         console.log("timetags1", this.timetags1)
 
-        
+
         this.timetags1.splice(this.timetags1.indexOf(tag), 1);
     },
 
 
-    
+
     change_time(index,row,item){
         console.log("item", index,row,item)
 
         this.table.list[index].timesArr.push(item)
-         
-       
+
+
     },
     tag_close(index,row,tag){
         console.log("tag", index,row,tag)
         this.table.list[index].timesArr.splice(this.table.list[index].timesArr.indexOf(tag), 1);
-       
+
     },
 
 
@@ -791,7 +792,7 @@ export default {
             "parammaps":{"enable":"1","ids":idsArr.join(",")}
           }
           GetDataByName(send_data).then(response => {
-            
+
 
              if (response.msg == 'fail') {
               this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
@@ -799,9 +800,9 @@ export default {
               this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
               this.getList()
             }
-             
+
           })
-  
+
         })
       }
     },
@@ -824,7 +825,7 @@ export default {
             "parammaps":{"enable":"0","ids":idsArr.join(",")}
           }
           GetDataByName(send_data).then(response => {
-            
+
 
              if (response.msg == 'fail') {
               this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
@@ -832,7 +833,7 @@ export default {
               this.$notify({ title: '', message: '禁用成功', type: 'success', duration: 2000 })
               this.getList()
             }
-             
+
           })
         })
       }
@@ -872,12 +873,12 @@ export default {
           }
         }
     },
- 
- 
- 
-     
-    
-   
+
+
+
+
+
+
     celldblclick(row, column, cell, event) {
       console.log(row, '=====')
       this.handleUpdate(row)
@@ -898,21 +899,21 @@ export default {
       // 编辑false,编辑保存true
       row.isUpdate = false
       row.isUpdateSave = true
-    
+
     },
     updateData(row) {
-      
-     
+
+
       console.log('点击了编辑保存', row)
-   
+
        row.pastureid =  Cookies.get('pastureid')
-       
- 
+
+
       if (row.tmrid === '' || row.tmrid == null ) {
         this.$message({ type: 'error', message: '推料车名称不能为空', duration: 2000 })
         return false
       }
-     
+
      const positiveInteger = /^[0-9]\d*$/
       if (!positiveInteger.test(parseFloat(row.allowableerror))) {
         this.$message({
@@ -931,7 +932,7 @@ export default {
       }
 
 
-   
+
 
 
 
@@ -945,7 +946,7 @@ export default {
       var timesTempArr = []
       timeArrRea.forEach(function(item){
         timesTempArr.push({"time":item})
-      }) 
+      })
 
       var send_data = {
         "common":{"returnmap":"0"},
@@ -968,7 +969,7 @@ export default {
         ]
       }
 
-    
+
 
       if(row.id == 0){
          var send_data2 =  {
@@ -999,7 +1000,7 @@ export default {
             },
 						{"name": "delPushingDetail","type": "e",
             "parammaps": {"id": row.id }
-            }, 
+            },
 						{"name":"insertPushingDetail",
             "resultmaps":{"list":timesTempArr},
 						"children":[
@@ -1021,21 +1022,21 @@ export default {
                 if (response.msg === 'fail') {
                   this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
                 } else {
-                  
+
                   this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-                
+
                   this.getList()
-                  
+
                 }
               })
           } else {
              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-          
+
           }
         })
 
-       
-     
+
+
     },
     updateCancel(row) {
       console.log('点击了编辑取消')
@@ -1064,7 +1065,7 @@ export default {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    
+
     tableRowClassName({ row }) {
       // console.log(row)
       if (row.isColor == '0') {
@@ -1073,10 +1074,10 @@ export default {
         return ''
       }
     },
-  
-   
-    
-  
+
+
+
+
 
 
     // 历史记录
@@ -1121,8 +1122,8 @@ export default {
         }, 100)
       })
     },
-  
-  
+
+
     // 应用
     handleApplication() {
       console.log('点击了应用')
@@ -1138,7 +1139,7 @@ export default {
             this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
           } else {
             this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-      
+
             this.getList()
           }
         })
@@ -1146,8 +1147,8 @@ export default {
         this.$message({ type: 'info', message: '已取消应用' })
       })
     },
-    
- 
+
+
     formatJson(filterVal, jsonData) {
       return jsonData.map(v =>
         filterVal.map(j => {
@@ -1159,7 +1160,7 @@ export default {
         })
       )
     },
- 
+
     blurBw(row) {
       console.log(row)
     },