Browse Source

更新 - 20220429 - 仪表盘

Epans 2 years ago
parent
commit
e4602ce14e
55 changed files with 4554 additions and 2533 deletions
  1. BIN
      dist.zip
  2. 16 13
      src/styles/index.scss
  3. 1 1
      src/views/basicData/driver/index.vue
  4. 47 47
      src/views/basicData/equipmentTMR/index.vue
  5. 19 19
      src/views/basicData/feedClassification/index.vue
  6. 122 122
      src/views/basicData/forkliftManagement/index.vue
  7. 85 82
      src/views/basicData/groupColumn/index.vue
  8. 16 16
      src/views/basicData/livestockCategory/index.vue
  9. 110 110
      src/views/basicData/managementGPS/index.vue
  10. 22 21
      src/views/basicData/supplier/index.vue
  11. 1 1
      src/views/formulationPlan/dailyExecutionPlan/historyRecord.vue
  12. 11 2
      src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue
  13. 1567 0
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  14. 1 1
      src/views/formulationPlan/premixedPlan/index.vue
  15. 1879 1520
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  16. 34 34
      src/views/inventoryManagement/feedContract/index.vue
  17. 31 31
      src/views/inventoryManagement/inventoryList/index.vue
  18. 47 47
      src/views/inventoryManagement/inventoryList/index改.vue
  19. 1 1
      src/views/inventoryManagement/laborConsumption/index.vue
  20. 13 13
      src/views/inventoryManagement/laborConsumption/index改.vue
  21. 16 16
      src/views/inventoryManagement/statistics/index.vue
  22. 19 19
      src/views/inventoryManagement/systemConsumption/index.vue
  23. 2 2
      src/views/inventoryManagement/systemConsumption/index备.vue
  24. 31 31
      src/views/inventoryManagement/warehousing/index.vue
  25. 34 34
      src/views/inventoryManagement/warehousing/index改.vue
  26. 1 1
      src/views/shedProduction/dungScores/historyRecord.vue
  27. 6 8
      src/views/shedProduction/dungScores/index.vue
  28. 24 24
      src/views/shedProduction/dutyRecord/index.vue
  29. 1 1
      src/views/shedProduction/fecalScreen/historyRecord.vue
  30. 9 11
      src/views/shedProduction/fecalScreen/index.vue
  31. 1 1
      src/views/shedProduction/formulaDryMatter/historyRecord.vue
  32. 10 12
      src/views/shedProduction/formulaDryMatter/index.vue
  33. 23 25
      src/views/shedProduction/materialRemainingRecord/index.vue
  34. 1 1
      src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue
  35. 9 11
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  36. 11 17
      src/views/shedProduction/performance/index.vue
  37. 1 1
      src/views/shedProduction/physicalConditionScore/historyRecord.vue
  38. 6 8
      src/views/shedProduction/physicalConditionScore/index.vue
  39. 2 2
      src/views/statisticalAnalysis/equipmentRunningTrack/index.vue
  40. 78 27
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  41. 51 4
      src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue
  42. 6 7
      src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue
  43. 1 1
      src/views/statisticalAnalysis/processAnalysis/group/index.vue
  44. 1 1
      src/views/statisticalAnalysis/processAnalysis/pasture/index.vue
  45. 1 1
      src/views/systemManagement/customboard2/ChartPanel2/index.vue
  46. 1 1
      src/views/systemManagement/dataSynchronization/index.vue
  47. 1 1
      src/views/systemManagement/groupInformation/index.vue
  48. 135 135
      src/views/systemManagement/labelManagement/index.vue
  49. 8 8
      src/views/systemManagement/notificationManagement/index.vue
  50. 1 1
      src/views/systemManagement/operation/index.vue
  51. 22 22
      src/views/systemManagement/operationManagement/group/index.vue
  52. 8 8
      src/views/systemManagement/operationManagement/pasture/index.vue
  53. 1 1
      src/views/systemManagement/ranchInformation/index.vue
  54. 1 1
      src/views/systemManagement/role/index.vue
  55. 8 8
      src/views/systemManagement/user/index.vue

BIN
dist.zip


+ 16 - 13
src/styles/index.scss

@@ -294,7 +294,7 @@ input {
   //   width: 100%;
   //   table-layout: fixed !important;
   // }
-  .operation{margin-top: 10px;height: 44px;}
+  .operation{margin-top: 10px;height: 44px;margin-bottom: 4px;}
   .fixed-width button{vertical-align: middle;}
   .fixed-width button{padding: 0 0;}
   // 恢复默认
@@ -304,25 +304,25 @@ input {
   // 新增/资料库/初始化库存/新增入库单
   .el-button{padding: 0px 10px;font-size: 16px;}
   .success{
-    background: $color3; border-color: $color3; color: $color7;height: 34px; line-height:34px;
+    background: $color3; border-color: $color3; color: $color7;height: 38px; line-height:38px;
     i{color: $color1;}
   }
-  .success:focus{ background: $color3; border-color: $color3; color: $color7;height: 34px; line-height:34px;}
-  .success:hover{ color: $color1; border-color: $color1; background-color: $color5; height: 34px;line-height:34px;}
+  .success:focus{ background: $color3; border-color: $color3; color: $color7;height: 38px; line-height:38px;}
+  .success:hover{ color: $color1; border-color: $color1; background-color: $color5; height: 38px;line-height:38px;}
   // 复制
   .copy{
-    background: $color3; border-color: $color3; color: $color7;height: 34px; line-height:34px;
+    background: $color3; border-color: $color3; color: $color7;height: 38px; line-height:38px;
     i{color: $color4;}
   }
-  .copy:focus{ background: $color3; border-color: $color3; color: $color7;height: 34px; line-height:34px;}
-  .copy:hover{ color: $color4; border-color: $color4; background-color: $color6; height: 34px;line-height:34px;}
+  .copy:focus{ background: $color3; border-color: $color3; color: $color7;height: 38px; line-height:38px;}
+  .copy:hover{ color: $color4; border-color: $color4; background-color: $color6; height: 38px;line-height:38px;}
   // 删除
   .danger{
-    height: 34px;line-height:34px;background: $color3; border-color: $color3;
+    height: 38px;line-height:38px;background: $color3; border-color: $color3;
     i{color: $color2;}
   }
-  .danger:focus{height: 34px;line-height:34px;background: $color3; border-color: $color3; color: $color2;}
-  .danger:hover{height: 34px;background: rgba(252,48,47,.1); border-color: $color2; color: $color2;}
+  .danger:focus{height: 38px;line-height:38px;background: $color3; border-color: $color3; color: $color2;}
+  .danger:hover{height: 38px;line-height:38px;background: rgba(252,48,47,.1); border-color: $color2; color: $color2;}
 
   // 小编辑/小保存/下拉搜索按钮/拆分预混料
   .miniSuccess{ color: $color7;font-size:18px;border:none;background: none;}
@@ -350,9 +350,9 @@ input {
   .miniPrimary:focus{background: $color8; border-color: $color8; color: $color3;padding: 7px 10px !important;font-size:14px;min-width:60px;}
   .miniPrimary:hover{color: $color3; border-color: $color9; background-color: $color9;padding: 7px 10px !important;font-size:14px;min-width:60px;}
   // 顺序保存
-  .sortCancel{ background: $color3; border-color: $color3; color: $color13;height: 34px; line-height:34px;}
-  .sortCancel:focus{ background: $color3; border-color: $color12; color: $color13;height: 34px; line-height:34px;}
-  .sortCancel:hover{ color: $color13; border-color: $color12; background-color: $color3; height: 34px;line-height:34px;}
+  .sortCancel{ background: $color3; border-color: $color3; color: $color13;height: 38px; line-height:38px;}
+  .sortCancel:focus{ background: $color3; border-color: $color12; color: $color13;height: 38px; line-height:38px;}
+  .sortCancel:hover{ color: $color13; border-color: $color12; background-color: $color3; height: 38px;line-height:38px;}
   // 下拉取消
   .downminCancel{background: $color3; border-color: $color12; color: $color13;padding: 7px 10px;font-size:14px;min-width:60px;}
   .downminCancel:focus{background: $color3; border-color: $color12; color: $color13;padding: 7px 10px;font-size:14px;min-width:60px;}
@@ -508,3 +508,6 @@ input {
 .el-icon-full-screen:before {
   content: "\e719";
 }
+
+
+.search{padding-top:10px;clear: both;}

+ 1 - 1
src/views/basicData/driver/index.vue

@@ -352,5 +352,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 47 - 47
src/views/basicData/equipmentTMR/index.vue

@@ -11,9 +11,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -50,7 +50,7 @@
           </template>
         </el-table-column>
         <el-table-column label="车辆颜色" min-width="70px" align="center">
-          <template slot-scope="scope">
+          <template slot-scope="scope">
             <el-color-picker v-model="scope.row.tcolor" size="mini" :predefine="predefineColors" style="vertical-align: middle;" :disabled="scope.row.NoEdit" />
           </template>
         </el-table-column>
@@ -116,17 +116,17 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <!-- 新增 -->
-            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-            <span v-if="row.isCreate" class="centerSpan">|</span>
-            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-            <!-- 编辑 -->
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-            <!-- 编辑保存 -->
-            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+            <!-- 新增 -->
+            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+            <span v-if="row.isCreate" class="centerSpan">|</span>
+            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+            <!-- 编辑 -->
+            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+            <!-- 编辑保存 -->
+            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
           </template>
         </el-table-column>
@@ -146,9 +146,9 @@ export default {
   name: 'EquipmentTMR',
   components: { Pagination },
   data() {
-    return {
-      predefineColors: [
-        '#F44336', '#E91E63', '#9C27B0', '#673AB7', '#3F51B5', '#2196F3', '#03A9F4', '#00BCD4', '#009688', '#4CAF50', '#8BC34A', '#CDDC39', '#FFEB3B', '#FFC107', '#FF9800', '#FF5722', '#795548', '#9E9E9E', '#607D8B'
+    return {
+      predefineColors: [
+        '#F44336', '#E91E63', '#9C27B0', '#673AB7', '#3F51B5', '#2196F3', '#03A9F4', '#00BCD4', '#009688', '#4CAF50', '#8BC34A', '#CDDC39', '#FFEB3B', '#FFC107', '#FF9800', '#FF5722', '#795548', '#9E9E9E', '#607D8B'
       ],
       isRoleEdit: [],
       requestParams: [
@@ -282,11 +282,11 @@ export default {
       // this.table.temp.autosecondname = this.jumpDelayList.find(obj => obj.value === item).label
     },
     createData(row) {
-      console.log('点击了新增保存', row)
-      if (row.autosecond == '0') {
-        row.autozone = ''
-        row.autosecondname = ''
-        this.table.temp.autosecondname = ''
+      console.log('点击了新增保存', row)
+      if (row.autosecond == '0') {
+        row.autozone = ''
+        row.autosecondname = ''
+        this.table.temp.autosecondname = ''
       }
       this.table.temp.pastureid = Cookies.get('pastureid')
       this.table.temp.eqcode = row.eqcode
@@ -301,8 +301,8 @@ export default {
       this.table.temp.datainterface = row.datainterface
       this.table.temp.autozone = row.autozone
       this.table.temp.autosecond = row.autosecond
-      this.table.temp.autosecondname = this.table.temp.autosecondname
-      this.table.temp.imei = row.imei
+      this.table.temp.autosecondname = this.table.temp.autosecondname
+      this.table.temp.imei = row.imei
 
       // 检验用户名称/角色是否为空
       if (this.table.temp.eqcode == '' && this.table.temp.tname == '' && this.table.temp.datacaptureno == '' && this.table.temp.tclassid == '' && this.table.temp.maxstirfeed == '') {
@@ -338,8 +338,8 @@ export default {
         this.$message({ type: 'error', message: '数据采集卡请输入0-15之间整数', duration: 2000 })
         return false
       }
-      if (row.autosecond !== '0') {
-        const autozone = /^(?:[0-9]|1[0-9])$/
+      if (row.autosecond !== '0') {
+        const autozone = /^(?:[0-9]|1[0-9])$/
         if (!autozone.test(parseFloat(this.table.temp.autozone))) {
           this.$message({ type: 'error', message: '跳转重量域请输入0-20之间整数', duration: 2000 })
           return false
@@ -401,15 +401,15 @@ export default {
       row.isCreate = false
       row.isUpdate = false
       row.isUpdateSave = true
-      row.tclassid = String(row.tclassid)
-      if(row.autosecond == undefined){
-        this.$set(row,'autosecond','')
-        this.$set(row,'autosecondname','')
-      }else{
+      row.tclassid = String(row.tclassid)
+      if(row.autosecond == undefined){
+        this.$set(row,'autosecond','')
+        this.$set(row,'autosecondname','')
+      }else{
         row.autosecond = String(row.autosecond)
       }
       this.table.temp.tclassid = row.tclassid
-      this.table.temp.tclassname = row.tclassname
+      this.table.temp.tclassname = row.tclassname
       console.log(row)
       console.log(this.table.temp.tclassname)
     },
@@ -417,12 +417,12 @@ export default {
       console.log('点击了编辑保存', row)
       if (row.tcolor == null) {
         row.tcolor = '#CCCCCC'
-      }
-      if (row.autosecond == '0') {
-        row.autozone = ''
-        row.autosecondname = ''
-        this.table.temp.autosecondname = ''
-      }
+      }
+      if (row.autosecond == '0') {
+        row.autozone = ''
+        row.autosecondname = ''
+        this.table.temp.autosecondname = ''
+      }
 
       this.table.temp.pastureid = Cookies.get('pastureid')
       this.table.temp.eqcode = row.eqcode
@@ -479,14 +479,14 @@ export default {
       if (!maxstirfeed.test(parseInt(this.table.temp.maxstirfeed))) {
         this.$message({ type: 'error', message: '最大搅拌量请输入正整数', duration: 2000 })
         return false
-      }
+      }
       console.log(row.autozone, '=0000')
-      if (row.autosecond !== '0') {
-        const autozone = /^(?:[0-9]|1[0-9])$/
-        if (!autozone.test(parseFloat(this.table.temp.autozone))) {
-          this.$message({ type: 'error', message: '跳转重量域请输入0-20之间整数', duration: 2000 })
-          return false
-        }
+      if (row.autosecond !== '0') {
+        const autozone = /^(?:[0-9]|1[0-9])$/
+        if (!autozone.test(parseFloat(this.table.temp.autozone))) {
+          this.$message({ type: 'error', message: '跳转重量域请输入0-20之间整数', duration: 2000 })
+          return false
+        }
       }
       const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
       if (pattern.test(this.table.temp.eqcode)) {
@@ -599,5 +599,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 19 - 19
src/views/basicData/feedClassification/index.vue

@@ -12,9 +12,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -63,21 +63,21 @@
             <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <!-- 新增 -->
-            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-            <span v-if="row.isCreate" class="centerSpan">|</span>
-            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-            <!-- 编辑 -->
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-            <!-- 编辑保存 -->
-            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
-          </template>
+        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+            <!-- 新增 -->
+            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+            <span v-if="row.isCreate" class="centerSpan">|</span>
+            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+            <!-- 编辑 -->
+            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+            <!-- 编辑保存 -->
+            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+            <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+          </template>
         </el-table-column>
       </el-table>
       <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
@@ -427,5 +427,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 122 - 122
src/views/basicData/forkliftManagement/index.vue

@@ -9,9 +9,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -35,14 +35,14 @@
               <span v-if="table.pageNum">{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
               <span v-else>1</span>
             </template>
-          </el-table-column>
-          <el-table-column label="设备类型" min-width="110px" align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.NoEdit">{{ scope.row.tclassname }}</span>
-              <el-select v-if="scope.row.Edit" v-model="scope.row.tclassid" @change="changeTclass">
-                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.label" :value="item.id" />
-              </el-select>
-            </template>
+          </el-table-column>
+          <el-table-column label="设备类型" min-width="110px" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.NoEdit">{{ scope.row.tclassname }}</span>
+              <el-select v-if="scope.row.Edit" v-model="scope.row.tclassid" @change="changeTclass">
+                <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.label" :value="item.id" />
+              </el-select>
+            </template>
           </el-table-column>
           <el-table-column label="设备编号" min-width="110px" align="center">
             <template slot-scope="scope">
@@ -75,18 +75,18 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
-              <!-- 新增 -->
-              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-              <span v-if="row.isCreate" class="centerSpan">|</span>
-              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-              <!-- 编辑 -->
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-              <!-- 编辑保存 -->
-              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-              <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+              <!-- 新增 -->
+              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+              <span v-if="row.isCreate" class="centerSpan">|</span>
+              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+              <!-- 编辑 -->
+              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+              <!-- 编辑保存 -->
+              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+              <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
             </template>
           </el-table-column>
         </el-table>
@@ -110,16 +110,16 @@ export default {
       isRoleEdit: [],
       enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }],
       equipmentTypeList: [{ id: '0', name: '设备' }, { id: '6', name: '推料车' }, { id: '7', name: '推粪车' }],
-      getdownListParm: {
-        name: 'getDictByName',
-        page: 1,
-        offset: 1,
-        pagecount: '',
-        returntype: 'Map',
-        parammaps: {
-          dictname: '其他设备管理'
-        }
-      },
+      getdownListParm: {
+        name: 'getDictByName',
+        page: 1,
+        offset: 1,
+        pagecount: '',
+        returntype: 'Map',
+        parammaps: {
+          dictname: '其他设备管理'
+        }
+      },
       table: {
         rules: {
           name: { type: 'string', required: true, message: '必填字段', trigger: 'change' }
@@ -154,15 +154,15 @@ export default {
 
   created() {
     this.getList()
-    this.getButtons()
+    this.getButtons()
     this.getDownList()
   },
 
-  methods: {
-    getDownList() {
-      GetDataByName(this.getdownListParm).then(response => {
-        this.equipmentTypeList = response.data.list
-      })
+  methods: {
+    getDownList() {
+      GetDataByName(this.getdownListParm).then(response => {
+        this.equipmentTypeList = response.data.list
+      })
     },
     getButtons() {
       const Edit = 'ForkliftManagement'
@@ -195,10 +195,10 @@ export default {
     },
     handleEnableChange() {
       console.log('点击了是否启用')
-    },
-    changeTclass(item) {
-      this.table.temp.tclassname = this.equipmentTypeList.find(obj => obj.id == item).name
-      console.log(this.table.temp)
+    },
+    changeTclass(item) {
+      this.table.temp.tclassname = this.equipmentTypeList.find(obj => obj.id == item).name
+      console.log(this.table.temp)
     },
     handleSearch() {
       console.log('点击了查询')
@@ -284,18 +284,18 @@ export default {
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()
-        } else {
-          const isRepeat = new RegExp('Duplicate entry :code')
-          const isRepeat2 = new RegExp('Duplicate entry :infocode')
-          if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: '设备编号不可重复,请重新录入', duration: 2000 })
-            return false
-          }
-          if (isRepeat2.test(response.data)) {
-            this.$notify({ type: 'error', message: '数据采集编号不可重复,请重新录入', duration: 2000 })
-            return false
-          }
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          const isRepeat = new RegExp('Duplicate entry :code')
+          const isRepeat2 = new RegExp('Duplicate entry :infocode')
+          if (isRepeat.test(response.data)) {
+            this.$notify({ type: 'error', message: '设备编号不可重复,请重新录入', duration: 2000 })
+            return false
+          }
+          if (isRepeat2.test(response.data)) {
+            this.$notify({ type: 'error', message: '数据采集编号不可重复,请重新录入', duration: 2000 })
+            return false
+          }
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -334,35 +334,35 @@ export default {
       this.table.temp.infoCode = row.infoCode
       this.table.temp.enable = row.enable
       this.table.temp.remark = row.remark
-      this.table.temp.tclassid = row.tclassid
+      this.table.temp.tclassid = row.tclassid
       this.table.temp.tclassname = row.tclassname
       this.table.temp.id = row.id
-      if (this.table.temp.tclassid == '' && this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: '设备类型/设备编号/设备名称/数据采集卡编号不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: '设备编号/设备名称/数据采集卡编号不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.name == '' && this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: '设备名称/数据采集卡编号不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.tclassid == '') {
-        this.$message({ type: 'error', message: '设备类型不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.name == '') {
-        this.$message({ type: 'error', message: '设备名称不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.Code == '') {
-        this.$message({ type: 'error', message: '设备编号不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.infoCode == '') {
-        this.$message({ type: 'error', message: '数据采集卡编号不能为空', duration: 2000 })
-        return false
-      }
-      const infoCode = /^([0-9]|(1[0-5]))$/
-      if (!infoCode.test(parseInt(this.table.temp.infoCode))) {
-        this.$message({ type: 'error', message: '数据采集卡请输入0-15之间整数', duration: 2000 })
-        return false
+      if (this.table.temp.tclassid == '' && this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
+        this.$message({ type: 'error', message: '设备类型/设备编号/设备名称/数据采集卡编号不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.Code == '' && this.table.temp.name == '' && this.table.temp.infoCode == '') {
+        this.$message({ type: 'error', message: '设备编号/设备名称/数据采集卡编号不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.name == '' && this.table.temp.infoCode == '') {
+        this.$message({ type: 'error', message: '设备名称/数据采集卡编号不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.tclassid == '') {
+        this.$message({ type: 'error', message: '设备类型不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.name == '') {
+        this.$message({ type: 'error', message: '设备名称不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.Code == '') {
+        this.$message({ type: 'error', message: '设备编号不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.infoCode == '') {
+        this.$message({ type: 'error', message: '数据采集卡编号不能为空', duration: 2000 })
+        return false
+      }
+      const infoCode = /^([0-9]|(1[0-5]))$/
+      if (!infoCode.test(parseInt(this.table.temp.infoCode))) {
+        this.$message({ type: 'error', message: '数据采集卡请输入0-15之间整数', duration: 2000 })
+        return false
       }
 
       const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
@@ -387,16 +387,16 @@ export default {
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()
-        } else {
-          const isRepeat = new RegExp('Duplicate entry :code')
-          const isRepeat2 = new RegExp('Duplicate entry :infocode')
-          if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: '设备编号不可重复,请重新录入', duration: 2000 })
-            return false
-          }
-          if (isRepeat2.test(response.data)) {
-            this.$notify({ type: 'error', message: '数据采集编号不可重复,请重新录入', duration: 2000 })
-            return false
+        } else {
+          const isRepeat = new RegExp('Duplicate entry :code')
+          const isRepeat2 = new RegExp('Duplicate entry :infocode')
+          if (isRepeat.test(response.data)) {
+            this.$notify({ type: 'error', message: '设备编号不可重复,请重新录入', duration: 2000 })
+            return false
+          }
+          if (isRepeat2.test(response.data)) {
+            this.$notify({ type: 'error', message: '数据采集编号不可重复,请重新录入', duration: 2000 })
+            return false
           }
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         }
@@ -419,18 +419,18 @@ export default {
       MessageBox.confirm('是否确认删除此信息?', {
         confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
       }).then(() => {
-        this.selectList = []
-        this.requestParam = {}
-        this.requestParam.name = 'deleteTmrEquipment'
-        this.requestParam.parammaps = {}
-        this.requestParam.parammaps.id = row.id
-        PostDataByName(this.requestParam).then(response => {
-          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()
-          }
+        this.selectList = []
+        this.requestParam = {}
+        this.requestParam.name = 'deleteTmrEquipment'
+        this.requestParam.parammaps = {}
+        this.requestParam.parammaps.id = row.id
+        PostDataByName(this.requestParam).then(response => {
+          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()
+          }
         })
       }).catch(() => {
         this.$message({ type: 'info', message: '已取消删除' })
@@ -448,23 +448,23 @@ export default {
         MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
           confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         }).then(() => {
-          console.log(this.selectList)
-          this.requestParam = {}
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'deleteTmrEquipment', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('删除保存发送参数', this.requestParam)
-            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()
-            }
+          console.log(this.selectList)
+          this.requestParam = {}
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = { 'name': 'deleteTmrEquipment', 'type': 'e', 'parammaps': {
+            id: '@insertSpotList.id'
+          }}
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('删除保存发送参数', this.requestParam)
+            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()
+            }
           })
         })
       }
@@ -474,5 +474,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 85 - 82
src/views/basicData/groupColumn/index.vue

@@ -32,17 +32,17 @@
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" style="float:left;" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" style="float:left;" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
-      <el-button v-if="isOrder && isRoleEdit" style="float:left;" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
-       <div v-else style="float:left;margin-left: 10px;">
-        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
-        <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
+      <el-button v-if="isRoleEdit" style="float:left;" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+      <el-button v-if="isOrder && isRoleEdit" style="float:left;" icon="el-icon-sort" class="success" @click="handleChangeOrder">更改顺序</el-button>
+       <div v-else style="float:left;margin-left: 10px;">
+        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
+        <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
       </div>
     </div>
     <div class="table">
-      <u-table
+      <u-table
         id="table"
-        :key="table.tableKey"
+        :key="table.tableKey"
         ref="table"
         v-loading="table.listLoading"
         element-loading-text="给我一点时间"
@@ -53,9 +53,10 @@
         style="width: 100%;"
         :row-style="rowStyle"
         :cell-style="cellStyle"
-        class="elTable table-fixed"
+        class="elTable table-fixed"
         row-key="id"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" type="index" align="center" width="50" />
@@ -119,6 +120,7 @@
           </template>
         </el-table-column>
       </u-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>
   </div>
@@ -127,8 +129,8 @@
 
 <script>
 import { GetDataByName, GetDataByNames, PostDataByName, failproccess, ExecDataByConfig, checkButtons } from '@/api/common'
-import Cookies from 'js-cookie'
-import draggable from 'vuedraggable'
+import Cookies from 'js-cookie'
+import draggable from 'vuedraggable'
 import Sortable from 'sortablejs'
 import Pagination from '@/components/Pagination'
 import { MessageBox } from 'element-ui'
@@ -173,9 +175,10 @@ export default {
       arrowDown: true,
       arrowUp: false,
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
+      cellStyle: { padding: 0 + 'px' },
       dropState: false,
       isOrder: true,
+      myHeight:document.documentElement.clientHeight - 85- 150
     }
   },
 
@@ -542,83 +545,83 @@ export default {
           })
         })
       }
-    },
-    handleChangeOrder() {
-      this.isOrder = false
-      this.rowDrop()
-    },
-
-    saveChangeOrder() {
-      // 保存顺序
-      var sortArr = []
-      for (let i = 0; i < this.table.list.length; i++) {
-        var obj = {}
-        obj.sort = i + 1
-        obj.id = this.table.list[i].id
-        obj.pastureid = this.table.list[i].pastureid
-        sortArr.push(obj)
-      }
-      this.requestParam = {}
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': sortArr }}
-      this.requestParam.data[0].children = []
-      this.requestParam.data[0].children[0] = { 'name': 'updateBarSort', 'type': 'e', 'parammaps': {
-        id: '@insertSpotList.id',
-        pastureid: '@insertSpotList.pastureid',
-        sort: '@insertSpotList.sort'
-      }}
-      this.table.listLoading = true
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('顺序切换保存发送参数', this.requestParam)
-        this.table.listLoading = false
-        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()
-          this.isOrder = true
-        }
-      })
-    },
-    cancelChangeOrder() {
-      // 取消顺序
-      this.getList()
-      this.isOrder = true
-    },
-
-     // 行拖拽
-    rowDrop() {
-      console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
-      const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
-      const that = this
-      var sortable = Sortable.create(tbody, {
-        disabled: that.dropState,
-        onChoose({ newIndex, oldIndex }) {
-          console.log(that.isOrder, 'that.isOrder == false')
-          console.log(that.dropState, 'that.dropState')
-          if (that.dropState == true || that.isOrder == true) {
-            sortable.destroy()
-          }
-        },
-        onEnd({ newIndex, oldIndex }) {
-          const currRow = that.table.list.splice(oldIndex, 1)[0]
-          that.table.list.splice(newIndex, 0, currRow)
-          console.log('currRow', currRow)
-          console.log('oldIndex', oldIndex)
-          console.log('索引newIndex', newIndex)
-          console.log('拖动数据', currRow)
-          console.log('上', that.table.list[newIndex - 1])
-          console.log('下', that.table.list[newIndex + 1])
-        }
-      })
+    },
+    handleChangeOrder() {
+      this.isOrder = false
+      this.rowDrop()
+    },
+
+    saveChangeOrder() {
+      // 保存顺序
+      var sortArr = []
+      for (let i = 0; i < this.table.list.length; i++) {
+        var obj = {}
+        obj.sort = i + 1
+        obj.id = this.table.list[i].id
+        obj.pastureid = this.table.list[i].pastureid
+        sortArr.push(obj)
+      }
+      this.requestParam = {}
+      this.requestParam.common = { 'returnmap': '0' }
+      this.requestParam.data = []
+      this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': sortArr }}
+      this.requestParam.data[0].children = []
+      this.requestParam.data[0].children[0] = { 'name': 'updateBarSort', 'type': 'e', 'parammaps': {
+        id: '@insertSpotList.id',
+        pastureid: '@insertSpotList.pastureid',
+        sort: '@insertSpotList.sort'
+      }}
+      this.table.listLoading = true
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('顺序切换保存发送参数', this.requestParam)
+        this.table.listLoading = false
+        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()
+          this.isOrder = true
+        }
+      })
+    },
+    cancelChangeOrder() {
+      // 取消顺序
+      this.getList()
+      this.isOrder = true
+    },
+
+     // 行拖拽
+    rowDrop() {
+      console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
+      const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
+      const that = this
+      var sortable = Sortable.create(tbody, {
+        disabled: that.dropState,
+        onChoose({ newIndex, oldIndex }) {
+          console.log(that.isOrder, 'that.isOrder == false')
+          console.log(that.dropState, 'that.dropState')
+          if (that.dropState == true || that.isOrder == true) {
+            sortable.destroy()
+          }
+        },
+        onEnd({ newIndex, oldIndex }) {
+          const currRow = that.table.list.splice(oldIndex, 1)[0]
+          that.table.list.splice(newIndex, 0, currRow)
+          console.log('currRow', currRow)
+          console.log('oldIndex', oldIndex)
+          console.log('索引newIndex', newIndex)
+          console.log('拖动数据', currRow)
+          console.log('上', that.table.list[newIndex - 1])
+          console.log('下', that.table.list[newIndex + 1])
+        }
+      })
     },
   }
 }
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
   $width:350px;
   $left:325px;
   .selectInput{

+ 16 - 16
src/views/basicData/livestockCategory/index.vue

@@ -11,9 +11,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -65,18 +65,18 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
-              <!-- 新增 -->
-              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-              <span v-if="row.isCreate" class="centerSpan">|</span>
-              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-              <!-- 编辑 -->
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-              <!-- 编辑保存 -->
-              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-              <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+              <!-- 新增 -->
+              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+              <span v-if="row.isCreate" class="centerSpan">|</span>
+              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+              <!-- 编辑 -->
+              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+              <!-- 编辑保存 -->
+              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+              <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
             </template>
           </el-table-column>
         </el-table>
@@ -436,5 +436,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 110 - 110
src/views/basicData/managementGPS/index.vue

@@ -9,9 +9,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-form ref="form" :rules="table.rules" :model="table">
@@ -48,13 +48,13 @@
               <el-input v-if="scope.row.Edit" v-model="scope.row.gpsName" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" style="width:80%;padding:10px 0;" maxlength="32" />
             </template>
           </el-table-column>
-          <el-table-column label="关联设备" min-width="110px" align="center">
-            <template slot-scope="scope">
-              <span v-if="scope.row.NoEdit">{{ scope.row.tname }}</span>
-              <el-select v-if="scope.row.Edit" v-model="scope.row.tmrId" @change="(value)=> {handleAssociatedDevicesChange(value,scope.row)}">
-                <el-option v-for="item in associatedDevicesList" :key="item.id" :label="`名称:${item.tname} 编号:${item.eqcode}类型:${item.tclassname}`" :value="item.id" />
-              </el-select>
-            </template>
+          <el-table-column label="关联设备" min-width="110px" align="center">
+            <template slot-scope="scope">
+              <span v-if="scope.row.NoEdit">{{ scope.row.tname }}</span>
+              <el-select v-if="scope.row.Edit" v-model="scope.row.tmrId" @change="(value)=> {handleAssociatedDevicesChange(value,scope.row)}">
+                <el-option v-for="item in associatedDevicesList" :key="item.id" :label="`名称:${item.tname} 编号:${item.eqcode}类型:${item.tclassname}`" :value="item.id" />
+              </el-select>
+            </template>
           </el-table-column>
           <el-table-column label="备注" min-width="110px" align="center">
             <template slot-scope="scope">
@@ -69,18 +69,18 @@
           </el-table-column>
           <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
             <template slot-scope="{row}">
-              <!-- 新增 -->
-              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-              <span v-if="row.isCreate" class="centerSpan">|</span>
-              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-              <!-- 编辑 -->
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-              <!-- 编辑保存 -->
-              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-              <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+              <!-- 新增 -->
+              <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+              <span v-if="row.isCreate" class="centerSpan">|</span>
+              <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+              <!-- 编辑 -->
+              <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+              <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+              <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+              <!-- 编辑保存 -->
+              <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+              <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+              <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
             </template>
           </el-table-column>
         </el-table>
@@ -104,11 +104,11 @@ export default {
       isRoleEdit: [],
       enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }],
       associatedDevicesList: [{ id: 0, name: '设备001', name2: '00123', name3: '铲车' }, { id: 1, name: '设备002', name2: '00124', name3: '铲车' }, { id: 2, name: '设备003', name2: '00125', name3: '铲车' }],
-
-      getDownListParm: {
-        name: 'getTMRList', page: 1, offset: 1, pagecount: '', returntype: 'Map',
-        parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '1' }
-      },
+
+      getDownListParm: {
+        name: 'getTMRList', page: 1, offset: 1, pagecount: '', returntype: 'Map',
+        parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '1' }
+      },
       table: {
         rules: {
           name: { type: 'string', required: true, message: '必填字段', trigger: 'change' }
@@ -153,15 +153,15 @@ export default {
       const Edit = 'ForkliftManagement'
       const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
       this.isRoleEdit = isRoleEdit
-    },
-    getDownList() {
-      GetDataByName(this.getDownListParm).then(response => {
-        if (response.data.list !== null) {
-          this.associatedDevicesList = response.data.list
-        } else {
-          this.associatedDevicesList = []
-        }
-      })
+    },
+    getDownList() {
+      GetDataByName(this.getDownListParm).then(response => {
+        if (response.data.list !== null) {
+          this.associatedDevicesList = response.data.list
+        } else {
+          this.associatedDevicesList = []
+        }
+      })
     },
     getList() {
       this.table.listLoading = true
@@ -181,7 +181,7 @@ export default {
           this.table.total = response.data.total
         } else {
           this.table.list = []
-        }
+        }
         this.table.total = this.table.list.length
         setTimeout(() => {
           this.table.listLoading = false
@@ -204,8 +204,8 @@ export default {
       this.table.getdataListParm.offset = 1
       this.getList()
     },
-    handleAssociatedDevicesChange(item, row) {
-      row.associatedDevices = this.associatedDevicesList.find(obj => obj.id === item).name
+    handleAssociatedDevicesChange(item, row) {
+      row.associatedDevices = this.associatedDevicesList.find(obj => obj.id === item).name
     },
     handleCreate() {
       console.log('点击了新增')
@@ -300,26 +300,26 @@ export default {
       this.table.temp.enable = row.enable
       this.table.temp.remark = row.remark
       this.table.temp.id = row.id
-      if (this.table.temp.gpsCode == '' && this.table.temp.gpsName == '') {
-        this.$message({ type: 'error', message: 'GPS编号/GPS名称不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.gpsCode == '' && this.table.temp.datacaptureno == '') {
-        this.$message({ type: 'error', message: 'GPS编号不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.gpsName == '') {
-        this.$message({ type: 'error', message: 'GPS名称不能为空', duration: 2000 })
-        return false
-      }
-
-      const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
-      console.log(this.table.temp.gpsCode)
-      if (pattern.test(this.table.temp.gpsCode)) {
-        this.$message({ type: 'error', message: 'GPS编号不可输入特殊字符', duration: 2000 })
-        return false
-      }
-      if (pattern.test(this.table.temp.tname)) {
-        this.$message({ type: 'error', message: 'GPS名称不可输入特殊字符', duration: 2000 })
-        return false
+      if (this.table.temp.gpsCode == '' && this.table.temp.gpsName == '') {
+        this.$message({ type: 'error', message: 'GPS编号/GPS名称不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.gpsCode == '' && this.table.temp.datacaptureno == '') {
+        this.$message({ type: 'error', message: 'GPS编号不能为空', duration: 2000 })
+        return false
+      } else if (this.table.temp.gpsName == '') {
+        this.$message({ type: 'error', message: 'GPS名称不能为空', duration: 2000 })
+        return false
+      }
+
+      const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
+      console.log(this.table.temp.gpsCode)
+      if (pattern.test(this.table.temp.gpsCode)) {
+        this.$message({ type: 'error', message: 'GPS编号不可输入特殊字符', duration: 2000 })
+        return false
+      }
+      if (pattern.test(this.table.temp.tname)) {
+        this.$message({ type: 'error', message: 'GPS名称不可输入特殊字符', duration: 2000 })
+        return false
       }
 
       this.isokDisable = true
@@ -350,66 +350,66 @@ export default {
       this.getList()
     },
 
-    handleRowDelete(row) {
-      console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        this.selectList = []
-        this.requestParam = {}
-        this.requestParam.name = 'deleteGps'
-        this.requestParam.parammaps = {}
-        // this.requestParam.parammaps.pastureid = row.pastureid
-        this.requestParam.parammaps.id = row.id
-        PostDataByName(this.requestParam).then(response => {
-          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()
-          }
-        })
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
-      })
+    handleRowDelete(row) {
+      console.log('点击了行内删除')
+      MessageBox.confirm('是否确认删除此信息?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+        this.selectList = []
+        this.requestParam = {}
+        this.requestParam.name = 'deleteGps'
+        this.requestParam.parammaps = {}
+        // this.requestParam.parammaps.pastureid = row.pastureid
+        this.requestParam.parammaps.id = row.id
+        PostDataByName(this.requestParam).then(response => {
+          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()
+          }
+        })
+      }).catch(() => {
+        this.$message({ type: 'info', message: '已取消删除' })
+      })
     },
     handleSelectionChange(val) {
       console.log('勾选数据', val)
       this.selectList = val
     },
-    handleDelete() {
-      console.log('点击了删除')
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择信息', duration: 2000 })
-      } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          console.log(this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'deleteGps', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id'
-            // pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('删除保存发送参数', this.requestParam)
-            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()
-            }
-          })
-        })
-      }
+    handleDelete() {
+      console.log('点击了删除')
+      if (this.selectList.length == 0) {
+        this.$message({ type: 'error', message: '请选择信息', duration: 2000 })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+        }).then(() => {
+          console.log(this.selectList)
+          this.requestParam.common = { 'returnmap': '0' }
+          this.requestParam.data = []
+          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = { 'name': 'deleteGps', 'type': 'e', 'parammaps': {
+            id: '@insertSpotList.id'
+            // pastureid: '@insertSpotList.pastureid'
+          }}
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('删除保存发送参数', this.requestParam)
+            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()
+            }
+          })
+        })
+      }
     }
   }
 }
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 22 - 21
src/views/basicData/supplier/index.vue

@@ -9,9 +9,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -27,6 +27,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -70,21 +71,21 @@
             <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <!-- 新增 -->
-            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-            <span v-if="row.isCreate" class="centerSpan">|</span>
-            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-            <!-- 编辑 -->
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-            <!-- 编辑保存 -->
-            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
-          </template>
+        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+            <!-- 新增 -->
+            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
+            <span v-if="row.isCreate" class="centerSpan">|</span>
+            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
+            <!-- 编辑 -->
+            <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+            <!-- 编辑保存 -->
+            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+            <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+          </template>
         </el-table-column>
       </el-table>
       <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
@@ -129,8 +130,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150-50
     }
   },
 
@@ -414,5 +415,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/historyRecord.vue

@@ -352,7 +352,7 @@ export default {
 
 <style  lang="scss" scoped>
  .search{margin-bottom: 10px;}
- .table{margin-top:10px;}
+ 
 
  .template{
    background: #fff;

+ 11 - 2
src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -25,6 +25,9 @@
           <el-tab-pane label="预混计划" name="预混计划">
             <PremixedPlan ref="PremixedPlan" :parent-date="date" />
           </el-tab-pane>
+          <el-tab-pane label="剩料计划" name="剩料计划">
+            <SurplusMaterialPlan ref="SurplusMaterialPlan" :parent-date="date" />
+          </el-tab-pane>
         </el-tabs>
       </el-row>
       <div slot="footer" class="dialog-footer">
@@ -39,12 +42,13 @@ import { PostDataByName } from '@/api/common'
 import DhedFormula from './typePage/dhedFormula.vue'
 import MaterialIssuancePlan from './typePage/materialIssuancePlan.vue'
 import PremixedPlan from './typePage/premixedPlan.vue'
+import SurplusMaterialPlan from './typePage/surplusMaterialPlan.vue'
 import { MessageBox } from 'element-ui'
 import Cookies from 'js-cookie'
 export default {
   name: 'RevisePlan',
   components: {
-    DhedFormula, MaterialIssuancePlan, PremixedPlan
+    DhedFormula, MaterialIssuancePlan, PremixedPlan,SurplusMaterialPlan
   },
   props: {
     show: { type: Boolean, default: false }, // 弹框可见标志
@@ -139,10 +143,15 @@ export default {
       } else if (item.name == '栏舍配方') {
         this.$refs.DhedFormula.getIsDisplay()
         this.$refs.DhedFormula.getDownList()
-      } else {
+      } else if (item.name == '栏舍配方'){
         this.$refs.PremixedPlan.getDownList()
         this.$refs.PremixedPlan.getIsDisplay()
         this.$refs.PremixedPlan.getList()
+      }else if (item.name == '剩料计划'){
+        this.$refs.SurplusMaterialPlan.getButtons()
+        this.$refs.SurplusMaterialPlan.getDownList()
+        this.$refs.SurplusMaterialPlan.getIsDisplay()
+        this.$refs.SurplusMaterialPlan.getList()
       }
     }
   }

+ 1567 - 0
src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -0,0 +1,1567 @@
+<template>
+  <div>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次
+      </el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次
+      </el-button>
+      <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
+      <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success"
+        @click="handleChangeOrder">更改顺序</el-button>
+      <div v-else style="float: left;margin-left: 10px;">
+        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存
+        </el-button>
+        <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
+      </div>
+      <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>
+    </div>
+    <div class="search" />
+    <div class="table">
+      <el-table
+        id="table2"
+        :key="table.tableKey"
+        ref="table"
+        v-loading="table.listLoading"
+        element-loading-text="给我一点时间"
+        :data="table.list"
+        border
+        highlight-current-row
+        style="width: 100%;"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable"
+        row-key="id"
+        @selection-change="handleSelect"
+      >
+        <el-table-column type="selection" min-width="50" />
+        <el-table-column label="车次" min-width="80px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sort }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="栏舍" min-width="110px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.qstr }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="TMR编号" prop="weight" min-width="110px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.tmrcode }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="生效" min-width="70px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66"
+              inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+          </template>
+        </el-table-column>
+        <el-table-column label="班次" min-width="120px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.times }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="撒料计划车次跟随" min-width="90px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.lppcode }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column label="剩料处理方式" min-width="130px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.treatmethod }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="转投栏舍" min-width="130px" align="center">
+          <template slot-scope="scope">
+            <span>{{ scope.row.hstr }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+            <el-button v-if="isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(row)" />
+          </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>
+    </div>
+
+
+    <!-- 新增/编辑 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="create.dialogFormVisible" :before-close="close" :close-on-click-modal="false" width="90%" :modal-append-to-body="false" :append-to-body="true">
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="create.rules" :model="create.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="sort">
+                <el-input ref="sort" v-model="create.temp.sort" class="filter-item" type="number" placeholder="车次" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="栏舍名称:" prop="barid">
+                <el-select v-model="create.temp.barid" multiple filterable placeholder="栏舍名称" class="filter-item"
+                  style="width:100%; " @change="changeBars">
+                  <el-option v-for="item in barsList" :key="item.id" :label="item.bname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="TMR编号:" prop="tmrid">
+                <el-select v-model="create.temp.tmrid" filterable placeholder="TMR编号" class="filter-item"
+                  style="width: 100%;" @change="changeTMRNumber">
+                  <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.eqcode" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="生效:" prop="sort">
+                <el-switch ref="enable" v-model="create.temp.enable" active-color="#13ce66" inactive-color="#ff4949"
+                  :active-value="1" :inactive-value="0" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="班次:" prop="times">
+                <el-select v-model="create.temp.times" filterable placeholder="班次" class="filter-item"
+                  style="width: 100%;" @change="changeTimes">
+                  <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="撒料计划车次跟随:" prop="lppid">
+                <el-select v-model="create.temp.lppid" filterable placeholder="撒料计划车次跟随" class="filter-item"
+                  style="width: 100%;" @change="changeCarFollow">
+                  <el-option v-for="item in carFollowList" :key="item.id" :label="item.lppcode" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="时间:" prop="rtime">
+
+                <el-time-picker v-model="create.temp.rtime" type="datetime" placeholder="选择时间" format="HH:mm"
+                  value-format="HH:mm" style="display: inline-block;width: 95%;" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="剩料处理方式:" prop="treatmethod">
+                <el-select v-model="create.temp.treatmethod" filterable placeholder="剩料处理方式" class="filter-item"
+                  style="width: 100%;" @change="changeResidueDisposal">
+                  <el-option v-for="item in residueDisposalList" :key="item.value" :label="item.label"
+                    :value="item.label" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="6">
+              <el-form-item label="转投栏舍:" prop="useinbarid">
+                <el-select v-model="create.temp.useinbarid" filterable placeholder="转投栏舍" class="filter-item"
+                  style="width: 100%;" @change="changeTransferbars" :disabled='isDis'>
+                  <el-option v-for="item in transferbarsList" :key="item.id" :label="item.bname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <draggable v-model="barSortList" group="itxst" animation="300" :group="{name: 'dashboard',pull: true}"
+              @start="onStart" @end="onEnd">
+              <transition-group>
+                <div
+                  style="width:80px;height:30px;border:1px soild #333;display:inline-block;background: #2ed1f9;padding: 5px 5px;margin-right: 15px;margin-bottom: 15px;"
+                  v-for="item in barSortList" key="1">{{item.bname}}</div>
+              </transition-group>
+            </draggable>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelClose" @click="close();">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save"
+            :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <!-- 校验 -->
+    <el-dialog :title="textMap[check.dialogStatus]" :destroy-on-close="true" :visible.sync="check.dialogFormVisible" :before-close="close" :close-on-click-modal="false" width="30%" :modal-append-to-body="false" :append-to-body="true">
+      <div class="check">
+        <p v-if="check.temp.isDistribution == '0'">当前有栏舍未分配,建议及时进行分配,未分配栏舍如下:</p>
+        <p v-else>已分配完:当前栏舍已分配完善</p>
+        {{ check.temp.bnames }}
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { GetDataByName, GetDataByNames,postJson, PostDataByName, failproccess, ExecDataByConfig,checkButtons } from '@/api/common'
+import Sortable from 'sortablejs'
+import Pagination from '@/components/Pagination'
+import Cookies from 'js-cookie'
+import { MessageBox } from 'element-ui'
+import draggable from 'vuedraggable'
+export default {
+  name: 'SurplusMaterialPlan',
+  components: { Pagination,draggable },
+  directives: {
+    focus: {
+      update: function(el, {
+        value
+      }) {
+        if (value) {
+          el.focus()
+        }
+      }
+    }
+  },
+  props: {
+    show: { type: Boolean, default: false }, // 弹框可见标志
+    parentDate: { type: String, defalut: '' }
+  },
+  data() {
+    return {
+      date: '',
+      barSortList: [],
+      dialogFull: false,
+      isDis: false,
+      isRoleEdit: [],
+      requestParams: [{
+          name: 'getBarListEnable',
+          offset: 0,
+          pagecount: 0,
+          parammaps: {
+            pastureid: Cookies.get('pastureid')
+          }
+        },
+        {
+          name: 'getTMRYHList',
+          offset: 0,
+          pagecount: 0,
+          parammaps: {
+            pastureid: Cookies.get('pastureid')
+          }
+        }
+      ],
+      barsList: [], // 栏舍
+      residueDisposalList: [{
+        value: '0',
+        label: '转投剩料'
+      }, {
+        value: '1',
+        label: '继续饲喂'
+      }], // 剩料处理方式
+      TMRNumberList: [], // TMR编号
+      barsNamesIdTempArr: [],
+      useinbarNamesIdTempArr: [],
+      // 班次
+      maxTime: {
+        getMaxTimesParm: {
+          name: 'getSysoptEnable',
+          page: 1,
+          offset: 1,
+          pagecount: 1,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            inforname: 'times'
+          }
+        }
+      },
+      frequencyList: [], // 班次
+      getCarFollowParm: {
+        name: 'getLPPCodeListDate',
+        offset: 0,
+        pagecount: 0,
+        parammaps: {
+          pastureid: Cookies.get('pastureid'),
+          times: '',
+          date:''
+        }
+      },
+      carFollowList: [], // 发料计划车次跟随
+      getTransferbarsParm: {
+        name: 'getBarListEnable',
+        offset: 0,
+        pagecount: 0,
+        parammaps: {
+          pastureid: Cookies.get('pastureid'),
+          times: '',
+          date:''
+        }
+      },
+      transferbarsList: [], // 转头栏舍
+      table: {
+        getdataListParm: {
+          name: 'getRemainplanListDate',
+          page: 1,
+          offset: 1,
+          pagecount: '',
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            date:''
+          }
+        },
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: true,
+        temp: {},
+        temp2: {}
+      },
+
+      // 新增/编辑
+      create: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {
+          pastureid: Cookies.get('pastureid'),
+          fname: '',
+          fclassid: '',
+          fclass: '',
+          feedcode: '',
+          source: '用户自定义',
+          printgroupid: '1',
+          printgroup: '无',
+          unitweight: '',
+          uprice: '',
+          allowratio: '',
+          autozone: '',
+          autosecond: '0',
+          autosecondname: '禁用',
+          confirmstart: '0',
+          confirmstartname: '禁用',
+          enable: '1',
+          trgaddress: '',
+          backup1: '',
+          backup2: '',
+          backup3: '',
+          sort: ''
+        },
+        rules: {
+          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        }
+      },
+      check: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        getCheckParm: {
+          name: 'checkRemainplanDate',
+          page: 1,
+          offset: 1,
+          pagecount: 10,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid')
+          }
+        },
+        temp: {
+          bnames: '',
+          isDistribution: ''
+        }
+      },
+      textMap: {
+        create: '新增',
+        update: '编辑',
+        check: '提示'
+      },
+      requestParam: {},
+      selectList: [],
+      isokDisable: false,
+      rowStyle: {
+        maxHeight: 30 + 'px',
+        height: 30 + 'px'
+      },
+      cellStyle: {
+        padding: 0 + 'px'
+      },
+      dropState: false,
+      isOrder: true
+    }
+  },
+  watch: {
+    // 监听show,visible 随着show变化而变化
+    show: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log('newVal-show', newVal)
+      }
+    },
+    parentDate: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log('newVal-show', newVal)
+        this.date = newVal
+      }
+    }
+  },
+  created() {
+    // this.getButtons()
+    this.getList()
+    this.getDownList()
+    this.getIsDisplay()
+  },
+  methods: {
+    getButtons() {
+      const Edit = 'SurplusMaterialPlan'
+      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      this.isRoleEdit = isRoleEdit
+    },
+    getDownList() {
+      GetDataByNames(this.requestParams).then(response => {
+        this.barsList = response.data.getBarListEnable.list
+        this.TMRNumberList = response.data.getTMRYHList.list
+      })
+    },
+    getIsDisplay() {
+      GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
+        if (response.data.list[0].inforvalue == 1) {
+          this.frequencyList = [{
+            id: '1',
+            name: '第一班'
+          }]
+        } else if (response.data.list[0].inforvalue == 2) {
+          this.frequencyList = [{
+            id: '1',
+            name: '第一班'
+          }, {
+            id: '2',
+            name: '第二班'
+          }]
+        } else if (response.data.list[0].inforvalue == 3) {
+          this.frequencyList = [{
+            id: '1',
+            name: '第一班'
+          }, {
+            id: '2',
+            name: '第二班'
+          }, {
+            id: '3',
+            name: '第三班'
+          }]
+        } else if (response.data.list[0].inforvalue == 4) {
+          this.frequencyList = [{
+            id: '1',
+            name: '第一班'
+          }, {
+            id: '2',
+            name: '第二班'
+          }, {
+            id: '3',
+            name: '第三班'
+          }, {
+            id: '4',
+            name: '第四班'
+          }]
+        }
+      })
+    },
+    getList() {
+      this.table.listLoading = true
+      this.table.getdataListParm.parammaps.date = this.date
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          for (let i = 0; i < response.data.list.length; i++) {
+            this.$set(response.data.list[i], 'Edit', false) // 编辑
+            this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
+            this.$set(response.data.list[i], 'groupEdit', false) // 饲料组编辑
+            this.$set(response.data.list[i], 'groupNoEdit', true) // 饲料组不可编辑
+            this.$set(response.data.list[i], 'isCreate', false) // 新增操作
+            this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
+            this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
+          }
+          var arr = response.data.list
+
+          arr.map(function(i, j) {
+            // console.log(i, '====')
+            if (i.qstrids) {
+              return i.barid = i.qstrids.split(',')
+            } else {
+              return i.barid = []
+            }
+          })
+
+          arr.map(function(i, j) {
+            if (i.hstrids) {
+              return i.useinbarid = i.hstrids
+            } else {
+              return i.useinbarid = ""
+            }
+          })
+
+          this.table.list = arr
+          // this.table.list = response.data.list
+          this.table.pageNum = response.data.pageNum
+          this.table.pageSize = response.data.pageSize
+          // this.rowDrop()
+          this.table.total = response.data.total
+        } else {
+          this.table.list = []
+        }
+
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
+      })
+    },
+    handleEnableChange() {
+      console.log('点击了生效')
+    },
+    handleChangeOrder() {
+      console.log('更改顺序')
+      this.isOrder = false
+      this.rowDrop()
+    },
+    rowDrop() {
+      const tbody = document.querySelector('#table2 .el-table__body-wrapper tbody')
+      const that = this
+      var sortable2 = Sortable.create(tbody, {
+        disabled: that.dropState,
+        onChoose({
+          newIndex,
+          oldIndex
+        }) {
+          console.log(that.isOrder, 'that.isOrder == false')
+          console.log(that.dropState, 'that.dropState')
+          if (that.dropState == true || that.isOrder == true) {
+            sortable2.destroy()
+          }
+        },
+        onEnd({
+          newIndex,
+          oldIndex
+        }) {
+          const currRow = that.table.list.splice(oldIndex, 1)[0]
+          that.table.list.splice(newIndex, 0, currRow)
+          console.log('索引', newIndex)
+          console.log('拖动数据', currRow)
+          console.log('上', that.table.list[newIndex - 1])
+          console.log('下', that.table.list[newIndex + 1])
+        }
+      })
+    },
+    saveChangeOrder() {
+      // 保存顺序
+      var sortArr = []
+      for (let i = 0; i < this.table.list.length; i++) {
+        var obj = {}
+        obj.sort = i + 1
+        obj.id = this.table.list[i].id
+        obj.pastureid = this.table.list[i].pastureid
+        sortArr.push(obj)
+      }
+      this.requestParam = {}
+      this.requestParam.common = {
+        'returnmap': '0'
+      }
+      this.requestParam.data = []
+      this.requestParam.data[0] = {
+        'name': 'insertSpotList',
+        'resultmaps': {
+          'list': sortArr
+        }
+      }
+      this.requestParam.data[0].children = []
+      this.requestParam.data[0].children[0] = {
+        'name': 'updateRemainplanSortDate',
+        'type': 'e',
+        'parammaps': {
+          id: '@insertSpotList.id',
+          pastureid: '@insertSpotList.pastureid',
+          sort: '@insertSpotList.sort',
+          date:this.date
+        }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('顺序切换保存发送参数', this.requestParam)
+        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()
+          this.isOrder = true
+        }
+      })
+    },
+    cancelChangeOrder() {
+      // 取消顺序
+      this.getList()
+      this.isOrder = true
+    },
+
+    // 新增
+    handleCreate() {
+      console.log('点击了新增')
+      this.resetTemp()
+      this.dialogFull = false
+      this.create.dialogStatus = 'create'
+      this.create.dialogFormVisible = true
+    },
+
+    resetTemp() {
+      this.create.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': ''
+      }
+      this.barSortList = []
+      this.isDis = false
+    },
+    changeBars(val) {
+
+      console.log(this.barsList)
+      console.log('点击了栏舍1', val)
+      var barSortList = []
+
+      var barsList = this.barsList
+      val.forEach(function(i) {
+        barsList.forEach(function(j) {
+          if (i == j.id) {
+            barSortList.push(j)
+          }
+        })
+      })
+      this.barSortList = barSortList
+
+      console.log('点击了栏舍1', barSortList)
+
+
+
+      this.table.temp.barid = barSortList
+      this.barsNamesIdTempArr = barSortList
+      this.$forceUpdate()
+
+    },
+
+    onStart() {
+      console.log(2222)
+    },
+    onEnd() {
+      console.log(this.barSortList)
+
+      this.table.temp.barid = this.barSortList
+      this.barsNamesIdTempArr = this.barSortList
+    },
+    // // TMR编号
+    changeTMRNumber(item) {
+      this.create.temp.tmrcode = this.TMRNumberList.find(obj => obj.id === item).eqcode
+    },
+    changeCarFollow(item, row) {
+      if (item == '') {
+        this.create.temp.lppcode = ''
+      } else {
+        this.create.temp.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
+      }
+    },
+
+    // 班次
+    changeTimes(item) {
+      console.log(item)
+      this.getCarFollowParm.parammaps.times = item
+
+      this.getCarFollowList()
+    },
+    // 撒料计划车次跟随列表
+    getCarFollowList() {
+      this.getCarFollowParm.parammaps.date = this.date
+      GetDataByName(this.getCarFollowParm).then(response => {
+        console.log('撒料计划车次跟随列表数据', response.data.list)
+        if (response.data.list !== null) {
+          this.carFollowList = response.data.list
+          this.create.temp.lppid = this.carFollowList[0].id
+          this.create.temp.lppcode = this.carFollowList[0].lppcode
+        }
+      })
+    },
+    changeResidueDisposal(item) {
+      console.log(item)
+      this.getCarFollowParm.parammaps.times = item
+      this.getTransferbarsList()
+      if (item == "继续饲喂") {
+        this.isDis = true
+      } else {
+        this.isDis = false
+      }
+    },
+    getTransferbarsList() {
+      GetDataByName(this.getTransferbarsParm).then(response => {
+
+        if (response.data.list !== null) {
+          this.transferbarsList = response.data.list
+        }
+        console.log(this.transferbarsList)
+      })
+    },
+
+    // 转头栏舍
+    changeTransferbars(val) {
+      console.log('点击了转头栏舍', val)
+    },
+    close(){
+      this.create.dialogFormVisible = false;
+      this.getList()
+    },
+    createData() {
+      console.log('点击了新增保存')
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['temp'].validate(valid => {
+        if (valid) {
+          if (this.create.temp.rtime == null || this.create.temp.rtime == 'null') {
+            this.create.temp.rtime = ''
+          }
+          if (this.create.temp.sort == '' && this.create.temp.barid == '' && this.create.temp.tmrid == '' && this
+            .create.temp.times == '' && this.create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '车次/栏舍/TMR编号/班次/剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times ==
+            '' && this.create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '栏舍/TMR编号/班次/剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp
+            .treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: 'TMR编号/班次/剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.times == '' && this.create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '班次/剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
+            this.$message({
+              type: 'error',
+              message: '车次不能为空且大于0',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.barid == '') {
+            this.$message({
+              type: 'error',
+              message: '栏舍不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.tmrid == '') {
+            this.$message({
+              type: 'error',
+              message: 'TMR编号不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.times == '') {
+            this.$message({
+              type: 'error',
+              message: '班次不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          }
+          if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
+            if (this.create.temp.useinbarid == '') {
+              this.$message({
+                type: 'error',
+                message: '转投栏舍不能为空',
+                duration: 2000
+              })
+              return false
+            }
+          }
+          if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
+            // this.create.temp.useinbarid = '0'
+            this.create.temp.useinbarid = '0'
+          }
+          if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
+            this.create.temp.rtime = ''
+          }
+          for (let i = 0; i < this.table.list.length; i++) {
+            if (this.create.temp.sort == this.table.list[i].sort) {
+              if (this.create.temp.myId !== this.table.list[i].myId) {
+                this.$message({
+                  type: 'error',
+                  message: '车次不可重复',
+                  duration: 2000
+                })
+                return false
+              }
+            }
+          }
+
+          var isInteger = /^\d+$/
+          if (this.create.temp.sort !== '') {
+            if (!isInteger.test(parseFloat(this.create.temp.sort))) {
+              this.$message({
+                type: 'error',
+                message: '车次请输入整数',
+                duration: 2000
+              })
+              return false
+            }
+          }
+
+
+
+          this.isokDisable = true
+          setTimeout(() => {
+            this.isokDisable = false
+          }, 1000)
+
+
+          console.log(this.create.temp)
+
+
+          var ztlasArr = [{
+            "bname": "",
+            "id": this.create.temp.useinbarid
+          }]
+
+          this.transferbarsList.forEach(function(item) {
+            if (item.id == ztlasArr[0].id) {
+              ztlasArr[0].bname = item.bname
+            }
+          })
+
+          console.log("ztlasArr", ztlasArr)
+          var ssss_data = {
+            "common": {
+              "returnmap": "0"
+            },
+            "data": [{
+                "name": "insertRemainplanDate",
+                "type": "e",
+                "parammaps": {
+
+                  pastureid: Cookies.get('pastureid'),
+                  sort: this.create.temp.sort,
+                  tmrid: this.create.temp.tmrid,
+                  tmrcode: this.create.temp.tmrcode,
+                  enable: this.create.temp.enable,
+                  times: this.create.temp.times,
+                  lppid: this.create.temp.lppid,
+                  lppcode: this.create.temp.lppcode,
+                  rtime: this.create.temp.rtime,
+                  treatmethod: this.create.temp.treatmethod,
+                  date:this.date
+                }
+              },
+              {
+                "name": "insertSpotList",
+                "resultmaps": {
+                  'list': this.barsNamesIdTempArr
+                },
+                "children": [{
+                  "name": "insertRpdetailDate",
+                  "type": "e",
+                  "parammaps": {
+                    "pastureid": Cookies.get('pastureid'),
+                    "bigid": "@insertRemainplanDate.LastInsertId",
+                    "barid": "@insertSpotList.id",
+                    "bar": "@insertSpotList.bname",
+                    "type": 0,
+                    date:this.date
+                  }
+                }]
+              },
+              {
+                "name": "insertRpdetailDate",
+                "type": "e",
+                "parammaps": {
+                  "pastureid": "1647917519",
+                  "bigid": "@insertRemainplanDate.LastInsertId",
+                  "barid": ztlasArr[0].id,
+                  "bar": ztlasArr[0].bname,
+                  "type": 1,
+                  date:this.date
+                }
+              }
+            ]
+          }
+          ExecDataByConfig(ssss_data).then(response => {
+            console.log('新增保存发送参数', this.requestParam)
+            if (response.msg === 'fail') {
+              this.$notify({
+                title: '保存失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '保存成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.create.dialogFormVisible = false
+              this.getList()
+              this.dropState = false
+            }
+          })
+
+
+        }
+      })
+    },
+    createCancel(row) {
+      console.log('点击了新增取消')
+      this.dropState = false
+      for (let i = 0; i < this.table.list.length; i++) {
+        if (row.myId === this.table.list[i].myId) {
+          var listIndex = this.table.list.indexOf(this.table.list[i])
+        }
+        if (listIndex > -1) {
+          this.table.list.splice(listIndex, 1)
+          return
+        }
+      }
+    },
+    // 编辑
+    handleUpdate(row) {
+      console.log('点击了编辑', row)
+      this.create.dialogStatus = 'update'
+      this.dialogFull = false
+      this.create.dialogFormVisible = true
+      this.getCarFollowParm.parammaps.times = row.times
+      this.getCarFollowList()
+
+      row.temp = {}
+      row.temp2 = {}
+
+
+      if (row.treatmethod == "继续饲喂") {
+        this.isDis = true
+      } else {
+        this.isDis = false
+      }
+
+
+
+      // if (row.useinbarid == '0') { row.useinbarid = "" }
+      if (row.barid == undefined) {
+        row.barid = []
+      }
+      if (row.tmrid == undefined) {
+        row.tmrid = ''
+      }
+      if (row.times == undefined) {
+        row.times = ''
+      }
+
+      if (row.treatmethod == undefined) {
+        row.treatmethod = ''
+      }
+      // this.getCarFollowParm.parammaps.times = row.times
+      if (row.times == '第一班') {
+        this.getCarFollowParm.parammaps.times = 1
+        row.times = '1'
+      } else if (row.times == '第二班') {
+        this.getCarFollowParm.parammaps.times = 2
+        row.times = '2'
+      } else if (row.times == '第三班') {
+        this.getCarFollowParm.parammaps.times = 3
+        row.times = '3'
+      } else if (row.times == '第四班') {
+        this.getCarFollowParm.parammaps.times = 4
+        row.times = '4'
+      } else if (row.times == '第五班') {
+        this.getCarFollowParm.parammaps.times = 5
+        row.times = '5'
+      }
+      GetDataByName(this.getCarFollowParm).then(response => {
+        console.log('撒料计划车次跟随列表数据', response.data.list)
+        if (response.data.list !== null) {
+          this.carFollowList = response.data.list
+        }
+      })
+      console.log(row, '====')
+      if (row.lppcode == undefined) {
+        this.$set(row, 'lppid', '')
+      }
+
+      this.getTransferbarsList()
+      row.barid = row.qstrids.split(',')
+      row.useinbarid = row.hstrids
+
+      if (row.useinbarid == '0') {
+        row.useinbarid = ""
+      }
+
+      var arr3 = []
+      for (let i = 0; i < row.barid.length; i++) {
+        arr3.push(this.barsList.find(obj => obj.id == row.barid[i]))
+      }
+      this.barsNamesIdTempArr = arr3
+      this.barSortList = arr3
+      var arr4 = []
+      this.dropState = true
+      this.create.temp = Object.assign({}, row)
+    },
+    updateData() {
+      console.log('点击了编辑保存')
+      this.isokDisable = true
+      setTimeout(() => {
+        this.isokDisable = false
+      }, 1000)
+      this.$refs['temp'].validate(valid => {
+        if (valid) {
+          if (this.create.temp.rtime == null || this.create.temp.rtime == 'null') {
+            this.create.temp.rtime = ''
+          }
+          if (this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times == '' && this
+            .create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '栏舍/TMR编号/班次/剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp
+            .treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: 'TMR编号/班次/剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.times == '' && this.create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '班次/混剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.barid == '') {
+            this.$message({
+              type: 'error',
+              message: '栏舍不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.tmrid == '') {
+            this.$message({
+              type: 'error',
+              message: 'TMR编号不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.times == '') {
+            this.$message({
+              type: 'error',
+              message: '班次不能为空',
+              duration: 2000
+            })
+            return false
+          } else if (this.create.temp.treatmethod == '') {
+            this.$message({
+              type: 'error',
+              message: '剩料处理方式不能为空',
+              duration: 2000
+            })
+            return false
+          }
+          if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
+            if (this.create.temp.useinbarid == '') {
+              this.$message({
+                type: 'error',
+                message: '转投栏舍不能为空',
+                duration: 2000
+              })
+              return false
+            }
+          }
+          if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
+            this.create.temp.useinbarid = '0'
+          }
+          if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
+            this.create.temp.rtime = ''
+          }
+          for (let i = 0; i < this.table.list.length; i++) {
+            if (this.create.temp.sort == this.table.list[i].sort) {
+              if (this.create.temp.id !== this.table.list[i].id) {
+                this.$message({
+                  type: 'error',
+                  message: '车次不可重复',
+                  duration: 2000
+                })
+                return false
+              }
+            }
+          }
+          var isInteger = /^\d+$/
+          if (this.create.temp.sort !== '') {
+            if (!isInteger.test(parseFloat(this.create.temp.sort))) {
+              this.$message({
+                type: 'error',
+                message: '车次请输入整数',
+                duration: 2000
+              })
+              return false
+            }
+          }
+          if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
+            this.$message({
+              type: 'error',
+              message: '车次不能为空且大于0',
+              duration: 2000
+            })
+            return false
+          }
+          if (this.create.temp.times == '第一班') {
+            this.create.temp.times = 1
+          } else if (this.create.temp.times == '第二班') {
+            this.create.temp.times = 2
+          } else if (this.create.temp.times == '第三班') {
+            this.create.temp.times = 3
+          } else if (this.create.temp.times == '第四班') {
+            this.create.temp.times = 4
+          } else if (this.create.temp.times == '第五班') {
+            this.create.temp.times = 5
+          }
+          this.isokDisable = true
+          setTimeout(() => {
+            this.isokDisable = false
+          }, 1000)
+
+
+          var ztlasArr2 = [{
+            "bname": "",
+            "id": this.create.temp.useinbarid
+          }]
+
+          this.transferbarsList.forEach(function(item) {
+            if (item.id == ztlasArr2[0].id) {
+              ztlasArr2[0].bname = item.bname
+            }
+          })
+          console.log("ztlasArr2", ztlasArr2)
+
+          var ssss_data2 = {
+            "common": {
+              "returnmap": "0"
+            },
+            "data": [{
+                "name": "updateRemainplanDate",
+                "type": "e",
+                "parammaps": {
+                  pastureid: this.create.temp.pastureid,
+                  id: this.create.temp.id,
+                  sort: this.create.temp.sort,
+                  tmrid: this.create.temp.tmrid,
+                  tmrcode: this.create.temp.tmrcode,
+                  enable: this.create.temp.enable,
+                  times: this.create.temp.times,
+                  lppid: this.create.temp.lppid,
+                  lppcode: this.create.temp.lppcode,
+                  rtime: this.create.temp.rtime,
+                  treatmethod: this.create.temp.treatmethod,
+                  date: this.date
+                }
+              },
+              {
+                "name": "deleteRpdetailDate",
+                "type": "e",
+                "parammaps": {
+                  pastureid: this.create.temp.pastureid,
+                  bigid: this.create.temp.id,
+                  date: this.date
+                }
+              },
+              {
+                "name": "insertSpotList2",
+                "resultmaps": {
+                  "list": this.barsNamesIdTempArr
+
+                },
+                "children": [{
+                  "name": "insertRpdetailDate",
+                  "type": "e",
+                  "parammaps": {
+                    pastureid: this.create.temp.pastureid,
+                    bigid: this.create.temp.id,
+                    "date": this.date,
+                    "barid": "@insertSpotList2.id",
+                    "bar": "@insertSpotList2.bname",
+                    "type": 0
+                  }
+                }]
+              },
+              {
+                "name": "insertRpdetailDate",
+                "type": "e",
+                "parammaps": {
+                  "pastureid": this.create.temp.pastureid,
+                  "bigid": this.create.temp.id,
+                  "barid": ztlasArr2[0].id,
+                  "bar": ztlasArr2[0].bname,
+                  "type": 1,
+                  "date": this.date
+                }
+              }
+            ]
+          }
+          ExecDataByConfig(ssss_data2).then(response => {
+            console.log('保存发送参数', this.requestParam)
+            if (response.msg === 'fail') {
+              this.$notify({
+                title: '保存失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
+            } else {
+              this.$notify({
+                title: '成功',
+                message: '保存成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.create.dialogFormVisible = false
+              this.getList()
+              this.dropState = false
+            }
+          })
+
+        }
+      })
+    },
+
+    updateCancel(row) {
+      console.log('点击了编辑取消')
+      // 编辑false,不可编辑true
+      row.Edit = false
+      row.NoEdit = true
+      // 新增false,编辑true,编辑保存false
+      row.isCreate = false
+      row.isUpdate = true
+      row.isUpdateSave = false
+      this.getList()
+      this.dropState = false
+    },
+
+    handleSelect(val) {
+      console.log('勾选数据', val)
+      this.selectList = val
+    },
+    // 行内删除
+    handleRowDelete(row) {
+      console.log(row, '点击了行删除')
+      MessageBox.confirm('是否确认删除此信息?', {
+        confirmButtonText: '确认',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.selectList = []
+        this.requestParam = {}
+        this.requestParam.name = 'deleteRemainplanDate'
+        this.requestParam.parammaps = {}
+        this.requestParam.parammaps.pastureid = row.pastureid
+        this.requestParam.parammaps.id = row.id
+        this.requestParam.parammaps.date = this.date
+        PostDataByName(this.requestParam).then(response => {
+          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()
+          }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    // 减少车次
+    handleDelete() {
+      if (this.selectList.length == 0) {
+        this.$message({
+          type: 'error',
+          message: '请选择车次信息',
+          duration: 2000
+        })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          console.log(this.selectList)
+          this.requestParam.common = {
+            'returnmap': '0'
+          }
+          this.requestParam.data = []
+          this.requestParam.data[0] = {
+            'name': 'insertSpotList',
+            'resultmaps': {
+              'list': this.selectList
+            }
+          }
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = {
+            'name': 'deleteRemainplanDate',
+            'type': 'e',
+            'parammaps': {
+              id: '@insertSpotList.id',
+              pastureid: '@insertSpotList.pastureid',
+              date:this.date
+            }
+          }
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('删除保存发送参数', this.requestParam)
+            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()
+            }
+          })
+        })
+      }
+    },
+    // 校验
+    handleCheck() {
+      console.log('点击了校验')
+      this.check.dialogStatus = 'check'
+      this.check.dialogFormVisible = true
+      this.getCheckList()
+    },
+    getCheckList() {
+      this.check.getCheckParm.parammaps.date = this.date
+      GetDataByName(this.check.getCheckParm).then(response => {
+        if (response.data.list[0].bnames !== undefined) {
+          this.check.temp.isDistribution = 0
+          this.check.temp.bnames = response.data.list[0].bnames
+        } else {
+          this.check.temp = {}
+          this.check.temp.isDistribution = 1
+        }
+      })
+    },
+    handleTakeEffect() {
+      if (this.selectList.length == 0) {
+        this.$message({
+          type: 'error',
+          message: '请选择车次信息',
+          duration: 2000
+        })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.selectList.length; i++) {
+            // this.$set(this.selectList[i], 'enable', '1')
+            this.selectList[i].enable = 1
+          }
+          console.log('生效', this.selectList)
+          this.requestParam.common = {
+            'returnmap': '0'
+          }
+          this.requestParam.data = []
+          this.requestParam.data[0] = {
+            'name': 'insertSpotList',
+            'resultmaps': {
+              'list': this.selectList
+            }
+          }
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = {
+            'name': 'updateRemainplanEnableDate',
+            'type': 'e',
+            'parammaps': {
+              enable: '@insertSpotList.enable',
+              id: '@insertSpotList.id',
+              pastureid: '@insertSpotList.pastureid',
+              date:this.date
+            }
+          }
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('生效保存发送参数', this.requestParam)
+            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()
+            }
+          })
+        })
+      }
+    },
+    handleDisable() {
+      if (this.selectList.length == 0) {
+        this.$message({
+          type: 'error',
+          message: '请选择车次信息',
+          duration: 2000
+        })
+      } else {
+        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          for (let i = 0; i < this.selectList.length; i++) {
+            // this.$set(this.selectList[i], 'enable', '1')
+            this.selectList[i].enable = 0
+          }
+          console.log('禁用', this.selectList)
+          this.requestParam.common = {
+            'returnmap': '0'
+          }
+          this.requestParam.data = []
+          this.requestParam.data[0] = {
+            'name': 'insertSpotList',
+            'resultmaps': {
+              'list': this.selectList
+            }
+          }
+          this.requestParam.data[0].children = []
+          this.requestParam.data[0].children[0] = {
+            'name': 'updateRemainplanEnableDate',
+            'type': 'e',
+            'parammaps': {
+              enable: '@insertSpotList.enable',
+              id: '@insertSpotList.id',
+              pastureid: '@insertSpotList.pastureid',
+              date:this.date
+            }
+          }
+          ExecDataByConfig(this.requestParam).then(response => {
+            console.log('禁用保存发送参数', this.requestParam)
+            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()
+            }
+          })
+        })
+      }
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .search {
+    clear: both;
+  }
+
+  .table {
+    margin-top: 10px;
+  }
+</style>

+ 1 - 1
src/views/formulationPlan/premixedPlan/index.vue

@@ -884,7 +884,7 @@ export default {
 
 <style lang="scss" scoped>
   .search{clear: both;}
-  .table{margin-top:10px;}
+  
   /deep/ .el-time-panel__btn{
     height: 26px !important;
   }

+ 1879 - 1520
src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -1,36 +1,29 @@
 <template>
   <div class="app-container">
     <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次</el-button>
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增车次
+      </el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" style="float: left;" @click="handleDelete">减少车次
+      </el-button>
       <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
-      <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success" @click="handleChangeOrder">更改顺序</el-button>
+      <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" style="float: left;" class="success"
+        @click="handleChangeOrder">更改顺序</el-button>
       <div v-else style="float: left;margin-left: 10px;">
-        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
+        <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存
+        </el-button>
         <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
       </div>
-      <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" 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 class="import" style="float: right;" @click="handleHistoryRecords">历史记录</el-button>
     </div>
     <div class="search" />
     <div class="table">
-      <el-table
-        id="table"
-        :key="table.tableKey"
-        v-loading="table.listLoading"
-        element-loading-text="给我一点时间"
-        :data="table.list"
-        border
-        fit
-        highlight-current-row
-        style="width: 100%;"
-        :row-style="rowStyle"
-        :cell-style="cellStyle"
-        class="elTable table-fixed"
-        row-key="id"
-        @selection-change="handleSelect"
-      >
+      <el-table id="table" :key="table.tableKey" v-loading="table.listLoading" element-loading-text="给我一点时间"
+        :data="table.list" border fit highlight-current-row style="width: 100%;" :row-style="rowStyle"
+        :cell-style="cellStyle" class="elTable table-fixed" row-key="id" @selection-change="handleSelect">
         <el-table-column type="selection" min-width="50" />
         <el-table-column label="车次" min-width="80px" align="center">
           <template slot-scope="scope">
@@ -52,7 +45,8 @@
         </el-table-column>
         <el-table-column label="生效" min-width="70px" align="center">
           <template slot-scope="scope">
-            <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+            <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66"
+              inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
           </template>
         </el-table-column>
         <el-table-column label="班次" min-width="120px" align="center">
@@ -70,13 +64,13 @@
 
         <el-table-column label="剩料处理方式" min-width="130px" align="center">
           <template slot-scope="scope">
-            <span  >{{ scope.row.treatmethod }}</span>
+            <span>{{ scope.row.treatmethod }}</span>
 
           </template>
         </el-table-column>
         <el-table-column label="转投栏舍" min-width="130px" align="center">
           <template slot-scope="scope">
-            <span  >{{ scope.row.hstr }}</span>
+            <span>{{ scope.row.hstr }}</span>
 
           </template>
         </el-table-column>
@@ -105,12 +99,14 @@
 
 
       </el-table>
-      <span v-if="table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
+      <span v-if="table.listLoading == false"
+        style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ table.total }}条</span>
     </div>
 
 
-   <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <!-- 新增/编辑 -->
+    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false"
+      width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -125,112 +121,100 @@
       </template>
       <div class="app-add">
         <el-form ref="temp" :rules="create.rules" :model="create.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="sort">
-                <el-input ref="sort" v-model="create.temp.sort" class="filter-item"  type="number"   placeholder="车次"    />
+                <el-input ref="sort" v-model="create.temp.sort" class="filter-item" type="number" placeholder="车次" />
               </el-form-item>
             </el-col>
-
             <el-col :span="6">
-
               <el-form-item label="栏舍名称:" prop="barid">
-                <el-select  v-model="create.temp.barid" multiple filterable placeholder="栏舍名称" class="filter-item" style="width:100%; " @change="changeBars">
-                <el-option v-for="item in barsList" :key="item.id" :label="item.bname" :value="item.id" />
-               </el-select>
+                <el-select v-model="create.temp.barid" multiple filterable placeholder="栏舍名称" class="filter-item"
+                  style="width:100%; " @change="changeBars">
+                  <el-option v-for="item in barsList" :key="item.id" :label="item.bname" :value="item.id" />
+                </el-select>
               </el-form-item>
             </el-col>
-
             <el-col :span="6">
               <el-form-item label="TMR编号:" prop="tmrid">
-                <el-select v-model="create.temp.tmrid" filterable placeholder="TMR编号" class="filter-item" style="width: 100%;" @change="changeTMRNumber">
+                <el-select v-model="create.temp.tmrid" filterable placeholder="TMR编号" class="filter-item"
+                  style="width: 100%;" @change="changeTMRNumber">
                   <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.eqcode" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
-
             <el-col :span="6">
               <el-form-item label="生效:" prop="sort">
-
-                 <el-switch ref="enable" v-model="create.temp.enable"  active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0"   />
+                <el-switch ref="enable" v-model="create.temp.enable" active-color="#13ce66" inactive-color="#ff4949"
+                  :active-value="1" :inactive-value="0" />
               </el-form-item>
             </el-col>
-
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="班次:" prop="times">
-                <el-select v-model="create.temp.times" filterable placeholder="班次" class="filter-item" style="width: 100%;" @change="changeTimes">
+                <el-select v-model="create.temp.times" filterable placeholder="班次" class="filter-item"
+                  style="width: 100%;" @change="changeTimes">
                   <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
-
             <el-col :span="6">
               <el-form-item label="撒料计划车次跟随:" prop="lppid">
-                <el-select v-model="create.temp.lppid" filterable placeholder="撒料计划车次跟随" class="filter-item" style="width: 100%;" @change="changeCarFollow">
+                <el-select v-model="create.temp.lppid" filterable placeholder="撒料计划车次跟随" class="filter-item"
+                  style="width: 100%;" @change="changeCarFollow">
                   <el-option v-for="item in carFollowList" :key="item.id" :label="item.lppcode" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
-
-           <el-col :span="6">
+            <el-col :span="6">
               <el-form-item label="时间:" prop="rtime">
 
-                <el-time-picker  v-model="create.temp.rtime" type="datetime" placeholder="选择时间" format="HH:mm" value-format="HH:mm" style="display: inline-block;width: 95%;" />
+                <el-time-picker v-model="create.temp.rtime" type="datetime" placeholder="选择时间" format="HH:mm"
+                  value-format="HH:mm" style="display: inline-block;width: 95%;" />
               </el-form-item>
             </el-col>
-
-
-             <el-col :span="6">
+            <el-col :span="6">
               <el-form-item label="剩料处理方式:" prop="treatmethod">
-                <el-select v-model="create.temp.treatmethod" filterable placeholder="剩料处理方式" class="filter-item" style="width: 100%;" @change="changeResidueDisposal">
-                  <el-option v-for="item in residueDisposalList" :key="item.value" :label="item.label" :value="item.label" />
+                <el-select v-model="create.temp.treatmethod" filterable placeholder="剩料处理方式" class="filter-item"
+                  style="width: 100%;" @change="changeResidueDisposal">
+                  <el-option v-for="item in residueDisposalList" :key="item.value" :label="item.label"
+                    :value="item.label" />
                 </el-select>
               </el-form-item>
             </el-col>
-
-
-
-
-
           </el-row>
-
           <el-row>
-              <el-col :span="6">
-                <el-form-item label="转投栏舍:" prop="useinbarid">
-                  <el-select v-model="create.temp.useinbarid" filterable placeholder="转投栏舍" class="filter-item" style="width: 100%;" @change="changeTransferbars" :disabled = 'isDis' >
-                    <el-option v-for="item in transferbarsList" :key="item.id" :label="item.bname" :value="item.id" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
+            <el-col :span="6">
+              <el-form-item label="转投栏舍:" prop="useinbarid">
+                <el-select v-model="create.temp.useinbarid" filterable placeholder="转投栏舍" class="filter-item"
+                  style="width: 100%;" @change="changeTransferbars" :disabled='isDis'>
+                  <el-option v-for="item in transferbarsList" :key="item.id" :label="item.bname" :value="item.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <draggable v-model="barSortList" group="itxst" animation="300" :group="{name: 'dashboard',pull: true}"
+              @start="onStart" @end="onEnd">
+              <transition-group>
+                <div
+                  style="width:80px;height:30px;border:1px soild #333;display:inline-block;background: #2ed1f9;padding: 5px 5px;margin-right: 15px;margin-bottom: 15px;"
+                  v-for="item in barSortList" key="1">{{item.bname}}</div>
+              </transition-group>
+            </draggable>
           </el-row>
-
-
-<el-row>
-           <draggable v-model="barSortList" group="itxst"   animation="300" :group="{name: 'dashboard',pull: true}" @start="onStart" @end="onEnd">
-                    <transition-group>
-                        <div style = "width:80px;height:30px;border:1px soild #333;display:inline-block;background: #2ed1f9;padding: 5px 5px;margin-right: 15px;margin-bottom: 15px;"   v-for="item in barSortList"  key="1">{{item.bname}}</div>
-                    </transition-group>
-                </draggable>
-  </el-row>
-
-
-
-
         </el-form>
         <div slot="footer" class="dialog-footer">
           <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save"
+            :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
-
-
     <!-- 历史记录 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="history.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="history.dialogFormVisible"
+      :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -245,23 +229,15 @@
       </template>
       <div class="app-history">
         <div class="search">
-          <el-date-picker v-model="history.getdataListParm.parammaps.date" type="date" placeholder="请选择历史记录时间" :clearable="false" style="width: 180px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeDate" />
+          <el-date-picker v-model="history.getdataListParm.parammaps.date" type="date" placeholder="请选择历史记录时间"
+            :clearable="false" style="width: 180px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd"
+            @change="changeDate" />
           <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
         </div>
         <div class="table">
-          <el-table
-            :key="history.tableKey"
-            v-loading="history.listLoading"
-            element-loading-text="给我一点时间"
-            :data="history.list"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-          >
+          <el-table :key="history.tableKey" v-loading="history.listLoading" element-loading-text="给我一点时间"
+            :data="history.list" border fit highlight-current-row style="width: 100%;" :row-style="rowStyle"
+            :cell-style="cellStyle" class="elTable table-fixed">
             <el-table-column label="车次" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.sort }}</span>
@@ -279,7 +255,8 @@
             </el-table-column>
             <el-table-column label="生效" min-width="130px" align="center">
               <template slot-scope="scope">
-                <el-switch v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
+                <el-switch v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949"
+                  :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
               </template>
             </el-table-column>
             <el-table-column label="班次" min-width="130px" align="center">
@@ -308,7 +285,8 @@
               </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" />
+          <pagination v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset"
+            :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" />
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -317,7 +295,8 @@
     </el-dialog>
 
     <!-- 校验 -->
-    <el-dialog :title="textMap[check.dialogStatus]" :destroy-on-close="true" :visible.sync="check.dialogFormVisible" :close-on-click-modal="false" width="30%">
+    <el-dialog :title="textMap[check.dialogStatus]" :destroy-on-close="true" :visible.sync="check.dialogFormVisible"
+      :close-on-click-modal="false" width="30%">
       <div class="check">
         <p v-if="check.temp.isDistribution == '0'">当前有栏舍未分配,建议及时进行分配,未分配栏舍如下:</p>
         <p v-else>已分配完:当前栏舍已分配完善</p>
@@ -332,1573 +311,1953 @@
 </template>
 
 <script>
-import { GetDataByName, GetDataByNames, PostDataByName, failproccess, ExecDataByConfig, checkButtons } from '@/api/common'
-
-import Pagination from '@/components/Pagination'
-import Sortable from 'sortablejs'
-import draggable from 'vuedraggable'
-import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'SurplusMaterialPlan',
-  components: { Pagination ,draggable},
-  data() {
-    return {
-     barSortList: [ ],
-      dialogFull: false,
-      isDis: false,
-      isRoleEdit: [],
-      requestParams: [
-        { name: 'getBarListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
-        { name: 'getTMRYHList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
-      ],
-      barsList: [], // 栏舍
-      residueDisposalList: [{ value: '0', label: '转投剩料' }, { value: '1', label: '继续饲喂' }], // 剩料处理方式
-      TMRNumberList: [], // TMR编号
-      barsNamesIdTempArr: [],
-      useinbarNamesIdTempArr: [],
-      // 班次
-      maxTime: {
-        getMaxTimesParm: {
-          name: 'getSysoptEnable',
-          page: 1,
-          offset: 1,
-          pagecount: 1,
-          returntype: 'Map',
+  import {
+    GetDataByName,
+    GetDataByNames,
+    PostDataByName,
+    failproccess,
+    ExecDataByConfig,
+    checkButtons
+  } from '@/api/common'
+
+  import Pagination from '@/components/Pagination'
+  import Sortable from 'sortablejs'
+  import draggable from 'vuedraggable'
+  import Cookies from 'js-cookie'
+  import {
+    MessageBox
+  } from 'element-ui'
+  export default {
+    name: 'SurplusMaterialPlan',
+    components: {
+      Pagination,
+      draggable
+    },
+    data() {
+      return {
+        barSortList: [],
+        dialogFull: false,
+        isDis: false,
+        isRoleEdit: [],
+        requestParams: [{
+            name: 'getBarListEnable',
+            offset: 0,
+            pagecount: 0,
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          },
+          {
+            name: 'getTMRYHList',
+            offset: 0,
+            pagecount: 0,
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          }
+        ],
+        barsList: [], // 栏舍
+        residueDisposalList: [{
+          value: '0',
+          label: '转投剩料'
+        }, {
+          value: '1',
+          label: '继续饲喂'
+        }], // 剩料处理方式
+        TMRNumberList: [], // TMR编号
+        barsNamesIdTempArr: [],
+        useinbarNamesIdTempArr: [],
+        // 班次
+        maxTime: {
+          getMaxTimesParm: {
+            name: 'getSysoptEnable',
+            page: 1,
+            offset: 1,
+            pagecount: 1,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid'),
+              inforname: 'times'
+            }
+          }
+        },
+        frequencyList: [], // 班次
+        getCarFollowParm: {
+          name: 'getLPPCodeList',
+          offset: 0,
+          pagecount: 0,
           parammaps: {
             pastureid: Cookies.get('pastureid'),
-            inforname: 'times'
+            times: ''
           }
-        }
-      },
-      frequencyList: [], // 班次
-      getCarFollowParm: {
-        name: 'getLPPCodeList',
-        offset: 0,
-        pagecount: 0,
-        parammaps: {
-          pastureid: Cookies.get('pastureid'),
-          times: ''
-        }
-      },
-      carFollowList: [], // 发料计划车次跟随
-      getTransferbarsParm: {
-        name: 'getBarListEnable',
-        offset: 0,
-        pagecount: 0,
-        parammaps: {
-          pastureid: Cookies.get('pastureid'),
-          times: ''
-        }
-      },
-      transferbarsList: [], // 转头栏舍
-      table: {
-        getdataListParm: {
-          name: 'getRemainplanList',
-          page: 1,
-          offset: 1,
-          pagecount: '',
-          returntype: 'Map',
+        },
+        carFollowList: [], // 发料计划车次跟随
+        getTransferbarsParm: {
+          name: 'getBarListEnable',
+          offset: 0,
+          pagecount: 0,
           parammaps: {
-            pastureid: Cookies.get('pastureid')
+            pastureid: Cookies.get('pastureid'),
+            times: ''
           }
         },
-        tableKey: 0,
-        list: [],
-        total: 0,
-        listLoading: true,
-        temp: {},
-        temp2: {}
-      },
-
-       // 新增/编辑
-      create: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '', sort: '' },
-        rules: {
-          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
-        }
-      },
+        transferbarsList: [], // 转头栏舍
+        table: {
+          getdataListParm: {
+            name: 'getRemainplanList',
+            page: 1,
+            offset: 1,
+            pagecount: '',
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          },
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          temp: {},
+          temp2: {}
+        },
 
+        // 新增/编辑
+        create: {
+          dialogFormVisible: false,
+          dialogStatus: '',
+          temp: {
+            pastureid: Cookies.get('pastureid'),
+            fname: '',
+            fclassid: '',
+            fclass: '',
+            feedcode: '',
+            source: '用户自定义',
+            printgroupid: '1',
+            printgroup: '无',
+            unitweight: '',
+            uprice: '',
+            allowratio: '',
+            autozone: '',
+            autosecond: '0',
+            autosecondname: '禁用',
+            confirmstart: '0',
+            confirmstartname: '禁用',
+            enable: '1',
+            trgaddress: '',
+            backup1: '',
+            backup2: '',
+            backup3: '',
+            sort: ''
+          },
+          rules: {
+            // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+            // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+            // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          }
+        },
 
 
-      history: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: {},
-        rules: {},
-        tableKey: 0,
-        list: [],
-        total: 0,
-        listLoading: true,
 
-        getdataDateParm: {
-          name: 'getRPMaxDate',
-          page: 1,
-          offset: 1,
-          pagecount: 10,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid')
+        history: {
+          dialogFormVisible: false,
+          dialogStatus: '',
+          temp: {},
+          rules: {},
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+
+          getdataDateParm: {
+            name: 'getRPMaxDate',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          },
+          getdataListParm: {
+            name: 'getRemainplanListDate',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid'),
+              date: ''
+            }
           }
         },
-        getdataListParm: {
-          name: 'getRemainplanListDate',
-          page: 1,
-          offset: 1,
-          pagecount: 10,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            date: ''
-          }
-        }
-      },
-      check: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        getCheckParm: {
-          name: 'checkRemainplan',
-          page: 1,
-          offset: 1,
-          pagecount: 10,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid')
+        check: {
+          dialogFormVisible: false,
+          dialogStatus: '',
+          getCheckParm: {
+            name: 'checkRemainplan',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: Cookies.get('pastureid')
+            }
+          },
+          temp: {
+            bnames: '',
+            isDistribution: ''
           }
         },
-        temp: {
-          bnames: '',
-          isDistribution: ''
-        }
-      },
-      textMap: {
-        create: '新增',
-        update: '编辑',
-        history: '历史记录',
-        check: '提示'
-      },
-      requestParam: {},
-      selectList: [],
-      isokDisable: false,
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      dropState: false,
-      isOrder: true
-    }
-  },
-  created() {
-    this.getButtons()
-    this.getList()
-    this.getDownList()
-    this.getIsDisplay()
-  },
-  methods: {
-    getButtons() {
-      const Edit = 'SurplusMaterialPlan'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
-    },
-    getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.barsList = response.data.getBarListEnable.list
-        this.TMRNumberList = response.data.getTMRYHList.list
-      })
+        textMap: {
+          create: '新增',
+          update: '编辑',
+          history: '历史记录',
+          check: '提示'
+        },
+        requestParam: {},
+        selectList: [],
+        isokDisable: false,
+        rowStyle: {
+          maxHeight: 30 + 'px',
+          height: 30 + 'px'
+        },
+        cellStyle: {
+          padding: 0 + 'px'
+        },
+        dropState: false,
+        isOrder: true
+      }
     },
-    getIsDisplay() {
-      GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
-        if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: '1', name: '第一班' }]
-        } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }]
-        } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }]
-        } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [{ id: '1', name: '第一班' }, { id: '2', name: '第二班' }, { id: '3', name: '第三班' }, { id: '4', name: '第四班' }]
-        }
-      })
+    created() {
+      this.getButtons()
+      this.getList()
+      this.getDownList()
+      this.getIsDisplay()
     },
-    getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          for (let i = 0; i < response.data.list.length; i++) {
-            this.$set(response.data.list[i], 'Edit', false) // 编辑
-            this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
-            this.$set(response.data.list[i], 'groupEdit', false) // 饲料组编辑
-            this.$set(response.data.list[i], 'groupNoEdit', true) // 饲料组不可编辑
-            this.$set(response.data.list[i], 'isCreate', false) // 新增操作
-            this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
-            this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
+    methods: {
+      getButtons() {
+        const Edit = 'SurplusMaterialPlan'
+        const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+        this.isRoleEdit = isRoleEdit
+      },
+      getDownList() {
+        GetDataByNames(this.requestParams).then(response => {
+          this.barsList = response.data.getBarListEnable.list
+          this.TMRNumberList = response.data.getTMRYHList.list
+        })
+      },
+      getIsDisplay() {
+        GetDataByName(this.maxTime.getMaxTimesParm).then(response => {
+          if (response.data.list[0].inforvalue == 1) {
+            this.frequencyList = [{
+              id: '1',
+              name: '第一班'
+            }]
+          } else if (response.data.list[0].inforvalue == 2) {
+            this.frequencyList = [{
+              id: '1',
+              name: '第一班'
+            }, {
+              id: '2',
+              name: '第二班'
+            }]
+          } else if (response.data.list[0].inforvalue == 3) {
+            this.frequencyList = [{
+              id: '1',
+              name: '第一班'
+            }, {
+              id: '2',
+              name: '第二班'
+            }, {
+              id: '3',
+              name: '第三班'
+            }]
+          } else if (response.data.list[0].inforvalue == 4) {
+            this.frequencyList = [{
+              id: '1',
+              name: '第一班'
+            }, {
+              id: '2',
+              name: '第二班'
+            }, {
+              id: '3',
+              name: '第三班'
+            }, {
+              id: '4',
+              name: '第四班'
+            }]
           }
-          var arr = response.data.list
-
-          arr.map(function(i, j) {
-            // console.log(i, '====')
-            if (i.qstrids) {
-              return i.barid = i.qstrids.split(',')
-            } else {
-              return i.barid = []
+        })
+      },
+      getList() {
+        this.table.listLoading = true
+        GetDataByName(this.table.getdataListParm).then(response => {
+          console.log('table数据', response.data.list)
+          if (response.data.list !== null) {
+            for (let i = 0; i < response.data.list.length; i++) {
+              this.$set(response.data.list[i], 'Edit', false) // 编辑
+              this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
+              this.$set(response.data.list[i], 'groupEdit', false) // 饲料组编辑
+              this.$set(response.data.list[i], 'groupNoEdit', true) // 饲料组不可编辑
+              this.$set(response.data.list[i], 'isCreate', false) // 新增操作
+              this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
+              this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
             }
-          })
+            var arr = response.data.list
+
+            arr.map(function(i, j) {
+              // console.log(i, '====')
+              if (i.qstrids) {
+                return i.barid = i.qstrids.split(',')
+              } else {
+                return i.barid = []
+              }
+            })
 
-          arr.map(function(i, j) {
-            if (i.hstrids) {
-              return i.useinbarid = i.hstrids
-            } else {
-              return i.useinbarid = ""
-            }
-          })
+            arr.map(function(i, j) {
+              if (i.hstrids) {
+                return i.useinbarid = i.hstrids
+              } else {
+                return i.useinbarid = ""
+              }
+            })
+
+            this.table.list = arr
+            // this.table.list = response.data.list
+            this.table.pageNum = response.data.pageNum
+            this.table.pageSize = response.data.pageSize
+            // this.rowDrop()
+            this.table.total = response.data.total
+          } else {
+            this.table.list = []
+          }
 
-          this.table.list = arr
-          // this.table.list = response.data.list
-          this.table.pageNum = response.data.pageNum
-          this.table.pageSize = response.data.pageSize
-          // this.rowDrop()
-          this.table.total = response.data.total
-        } else {
-          this.table.list = []
+          setTimeout(() => {
+            this.table.listLoading = false
+          }, 100)
+        })
+      },
+      handleEnableChange() {
+        console.log('点击了生效')
+      },
+      handleChangeOrder() {
+        this.isOrder = false
+        this.rowDrop()
+      },
+      saveChangeOrder() {
+        // 保存顺序
+        var sortArr = []
+        for (let i = 0; i < this.table.list.length; i++) {
+          var obj = {}
+          obj.sort = i + 1
+          obj.id = this.table.list[i].id
+          obj.pastureid = this.table.list[i].pastureid
+          sortArr.push(obj)
         }
-
-        setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
-    },
-    handleEnableChange() {
-      console.log('点击了生效')
-    },
-    handleChangeOrder() {
-      this.isOrder = false
-      this.rowDrop()
-    },
-    saveChangeOrder() {
-      // 保存顺序
-      var sortArr = []
-      for (let i = 0; i < this.table.list.length; i++) {
-        var obj = {}
-        obj.sort = i + 1
-        obj.id = this.table.list[i].id
-        obj.pastureid = this.table.list[i].pastureid
-        sortArr.push(obj)
-      }
-      this.requestParam = {}
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': sortArr }}
-      this.requestParam.data[0].children = []
-      this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanSort', 'type': 'e', 'parammaps': {
-        id: '@insertSpotList.id',
-        pastureid: '@insertSpotList.pastureid',
-        sort: '@insertSpotList.sort'
-      }}
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('顺序切换保存发送参数', this.requestParam)
-        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()
-          this.isOrder = true
+        this.requestParam = {}
+        this.requestParam.common = {
+          'returnmap': '0'
         }
-      })
-    },
-    cancelChangeOrder() {
-      // 取消顺序
-      this.getList()
-      this.isOrder = true
-    },
-    // 行拖拽
-    rowDrop() {
-      console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
-      const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
-      const that = this
-      var sortable = Sortable.create(tbody, {
-        disabled: that.dropState,
-        onChoose({ newIndex, oldIndex }) {
-          if (that.dropState == true) {
-            sortable.destroy()
+        this.requestParam.data = []
+        this.requestParam.data[0] = {
+          'name': 'insertSpotList',
+          'resultmaps': {
+            'list': sortArr
           }
-        },
-        onEnd({ newIndex, oldIndex }) {
-          const currRow = that.table.list.splice(oldIndex, 1)[0]
-          that.table.list.splice(newIndex, 0, currRow)
-          console.log('索引', newIndex)
-          console.log('拖动数据', currRow)
-          console.log('上', that.table.list[newIndex - 1])
-          console.log('下', that.table.list[newIndex + 1])
         }
-      })
-    },
+        this.requestParam.data[0].children = []
+        this.requestParam.data[0].children[0] = {
+          'name': 'updateRemainplanSort',
+          'type': 'e',
+          'parammaps': {
+            id: '@insertSpotList.id',
+            pastureid: '@insertSpotList.pastureid',
+            sort: '@insertSpotList.sort'
+          }
+        }
+        ExecDataByConfig(this.requestParam).then(response => {
+          console.log('顺序切换保存发送参数', this.requestParam)
+          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()
+            this.isOrder = true
+          }
+        })
+      },
+      cancelChangeOrder() {
+        // 取消顺序
+        this.getList()
+        this.isOrder = true
+      },
+      // 行拖拽
+      rowDrop() {
+        console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
+        const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
+        const that = this
+        var sortable = Sortable.create(tbody, {
+          disabled: that.dropState,
+          onChoose({
+            newIndex,
+            oldIndex
+          }) {
+            if (that.dropState == true) {
+              sortable.destroy()
+            }
+          },
+          onEnd({
+            newIndex,
+            oldIndex
+          }) {
+            const currRow = that.table.list.splice(oldIndex, 1)[0]
+            that.table.list.splice(newIndex, 0, currRow)
+            console.log('索引', newIndex)
+            console.log('拖动数据', currRow)
+            console.log('上', that.table.list[newIndex - 1])
+            console.log('下', that.table.list[newIndex + 1])
+          }
+        })
+      },
 
-    // 新增
-    handleCreate() {
-      console.log('点击了新增')
-      this.resetTemp()
-      this.dialogFull = false
-      this.create.dialogStatus = 'create'
-      this.create.dialogFormVisible = true
-    },
+      // 新增
+      handleCreate() {
+        console.log('点击了新增')
+        this.resetTemp()
+        this.dialogFull = false
+        this.create.dialogStatus = 'create'
+        this.create.dialogFormVisible = true
+      },
 
-    resetTemp() {
-      this.create.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': '' }
-      this.barSortList = []
-      this.isDis = false
-    },
+      resetTemp() {
+        this.create.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': ''
+        }
+        this.barSortList = []
+        this.isDis = false
+      },
 
-    // // 栏舍
-    // changeBars(val) {
-    //   console.log('点击了栏舍', val)
-    //   var arr = []
-    //   this.barsList.forEach(function(i) {
-    //     val.forEach(function(j) {
-    //       if (i.id == j) { arr.push(i) }
-    //     })
-    //   })
-    //   console.log('点击了栏舍', arr)
-    //   this.table.temp.barid = arr
-    //   this.barsNamesIdTempArr = arr
-    //   this.$forceUpdate()
-    // },
-
-
-    changeBars(val) {
-
-      console.log(this.barsList)
-      console.log('点击了栏舍1', val)
-      var barSortList = []
-
-    var barsList = this.barsList
-      val.forEach(function(i){
-        barsList.forEach(function(j){
-          if(i == j.id){
-            barSortList.push(j)
-          }
+      // // 栏舍
+      // changeBars(val) {
+      //   console.log('点击了栏舍', val)
+      //   var arr = []
+      //   this.barsList.forEach(function(i) {
+      //     val.forEach(function(j) {
+      //       if (i.id == j) { arr.push(i) }
+      //     })
+      //   })
+      //   console.log('点击了栏舍', arr)
+      //   this.table.temp.barid = arr
+      //   this.barsNamesIdTempArr = arr
+      //   this.$forceUpdate()
+      // },
+
+
+      changeBars(val) {
+
+        console.log(this.barsList)
+        console.log('点击了栏舍1', val)
+        var barSortList = []
+
+        var barsList = this.barsList
+        val.forEach(function(i) {
+          barsList.forEach(function(j) {
+            if (i == j.id) {
+              barSortList.push(j)
+            }
+          })
         })
-      })
-      this.barSortList = barSortList
+        this.barSortList = barSortList
 
-console.log('点击了栏舍1', barSortList)
+        console.log('点击了栏舍1', barSortList)
 
 
 
-      this.table.temp.barid = barSortList
-      this.barsNamesIdTempArr = barSortList
-      this.$forceUpdate()
+        this.table.temp.barid = barSortList
+        this.barsNamesIdTempArr = barSortList
+        this.$forceUpdate()
 
-    },
+      },
 
-  onStart(){
-      console.log(2222)
-    },
-    onEnd(){
-      console.log(this.barSortList)
+      onStart() {
+        console.log(2222)
+      },
+      onEnd() {
+        console.log(this.barSortList)
 
-       this.table.temp.barid = this.barSortList
-       this.barsNamesIdTempArr = this.barSortList
-    },
-    // // TMR编号
-    // changeTMRNumber(item, row) {
-    //   row.tmrcode = this.TMRNumberList.find(obj => obj.id == item).tname
-    // },
+        this.table.temp.barid = this.barSortList
+        this.barsNamesIdTempArr = this.barSortList
+      },
+      // // TMR编号
+      // changeTMRNumber(item, row) {
+      //   row.tmrcode = this.TMRNumberList.find(obj => obj.id == item).tname
+      // },
 
-     changeTMRNumber(item) {
-      this.create.temp.tmrcode = this.TMRNumberList.find(obj => obj.id === item).eqcode
-    },
-    // // 撒料计划车次跟随列表
-    // changeCarFollow(item, row) {
-    //   if (item == '') {
-    //     row.lppcode = ''
-    //   } else {
-    //     row.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
-    //   }
-    // },
-
-    changeCarFollow(item, row) {
-      if (item == '') {
-        this.create.temp.lppcode = ''
-      } else {
-        this.create.temp.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
-      }
-    },
-    // 班次
-    // changeTimes(item, row) {
-    //   console.log(item, row)
-    //   this.getCarFollowParm.parammaps.times = item
-    //   this.getCarFollowList(row)
-    // },
-
-    // 班次
-    changeTimes(item) {
-      console.log(item)
-      this.getCarFollowParm.parammaps.times = item
-
-      this.getCarFollowList()
-    },
-    // 撒料计划车次跟随列表
-    // getCarFollowList(row) {
-    //   GetDataByName(this.getCarFollowParm).then(response => {
-    //     console.log('撒料计划车次跟随列表数据', response.data.list)
-    //     if (response.data.list !== null) {
-    //       this.carFollowList = response.data.list
-    //       row.lppid = this.carFollowList[0].id
-    //       row.lppcode = this.carFollowList[0].lppcode
-    //     }
-    //   })
-    // },
-     getCarFollowList() {
-      GetDataByName(this.getCarFollowParm).then(response => {
-        console.log('撒料计划车次跟随列表数据', response.data.list)
-        if (response.data.list !== null) {
-          this.carFollowList = response.data.list
-           this.create.temp.lppid = this.carFollowList[0].id
-           this.create.temp.lppcode = this.carFollowList[0].lppcode
+      changeTMRNumber(item) {
+        this.create.temp.tmrcode = this.TMRNumberList.find(obj => obj.id === item).eqcode
+      },
+      // // 撒料计划车次跟随列表
+      // changeCarFollow(item, row) {
+      //   if (item == '') {
+      //     row.lppcode = ''
+      //   } else {
+      //     row.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
+      //   }
+      // },
+
+      changeCarFollow(item, row) {
+        if (item == '') {
+          this.create.temp.lppcode = ''
+        } else {
+          this.create.temp.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
         }
-      })
-    },
+      },
+      // 班次
+      // changeTimes(item, row) {
+      //   console.log(item, row)
+      //   this.getCarFollowParm.parammaps.times = item
+      //   this.getCarFollowList(row)
+      // },
+
+      // 班次
+      changeTimes(item) {
+        console.log(item)
+        this.getCarFollowParm.parammaps.times = item
+
+        this.getCarFollowList()
+      },
+      // 撒料计划车次跟随列表
+      // getCarFollowList(row) {
+      //   GetDataByName(this.getCarFollowParm).then(response => {
+      //     console.log('撒料计划车次跟随列表数据', response.data.list)
+      //     if (response.data.list !== null) {
+      //       this.carFollowList = response.data.list
+      //       row.lppid = this.carFollowList[0].id
+      //       row.lppcode = this.carFollowList[0].lppcode
+      //     }
+      //   })
+      // },
+      getCarFollowList() {
+        GetDataByName(this.getCarFollowParm).then(response => {
+          console.log('撒料计划车次跟随列表数据', response.data.list)
+          if (response.data.list !== null) {
+            this.carFollowList = response.data.list
+            this.create.temp.lppid = this.carFollowList[0].id
+            this.create.temp.lppcode = this.carFollowList[0].lppcode
+          }
+        })
+      },
+
+      // changeResidueDisposal(item, row) {
+      //   console.log(item, row)
+      //   this.getCarFollowParm.parammaps.times = item
+      //   this.getTransferbarsList()
+      // },
+      changeResidueDisposal(item) {
+        console.log(item)
+        this.getCarFollowParm.parammaps.times = item
+        this.getTransferbarsList()
 
-    // changeResidueDisposal(item, row) {
-    //   console.log(item, row)
-    //   this.getCarFollowParm.parammaps.times = item
-    //   this.getTransferbarsList()
-    // },
-    changeResidueDisposal(item) {
-      console.log(item)
-      this.getCarFollowParm.parammaps.times = item
-      this.getTransferbarsList()
 
 
 
- 
-      
-      if(item == "继续饲喂"){
-        this.isDis = true
-      } else {
-         this.isDis = false
-      }
-    },
-    getTransferbarsList() {
-      GetDataByName(this.getTransferbarsParm).then(response => {
 
-        if (response.data.list !== null) {
-          this.transferbarsList = response.data.list
+        if (item == "继续饲喂") {
+          this.isDis = true
+        } else {
+          this.isDis = false
         }
-         console.log(this.transferbarsList)
-      })
-    },
-    // // 转头栏舍
-    // changeTransferbars(val) {
-    //   console.log('点击了转头栏舍', val)
-    //   var arr2 = []
-    //   this.transferbarsList.forEach(function(i) {
-    //     val.forEach(function(j) {
-    //       if (i.id == j) { arr2.push(i) }
-    //     })
-    //   })
-    //   this.table.temp2.useinbar = arr2
-    //   this.useinbarNamesIdTempArr = arr2
-    //   this.$forceUpdate()
-    // },
-
-    // 转头栏舍
-    changeTransferbars(val) {
-      console.log('点击了转头栏舍', val)
-      // var arr2 = []
-      // this.transferbarsList.forEach(function(i) {
-      //   val.forEach(function(j) {
-      //     if (i.id == j) { arr2.push(i) }
-      //   })
-      // })
-      // this.table.temp2.useinbar = arr2
-      // // this.useinbarNamesIdTempArr = arr2
-      // this.$forceUpdate()
-    },
+      },
+      getTransferbarsList() {
+        GetDataByName(this.getTransferbarsParm).then(response => {
 
-    // createData(row) {
-    //   console.log('点击了新增保存', row)
-    //   if (row.rtime == null || row.rtime == 'null') {
-    //     row.rtime = ''
-    //   }
-    //   if (row.sort == '' && row.barid == '' && row.tmrid == '' && row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '车次/栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.barid == '' && row.tmrid == '' && row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.tmrid == '' && row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: 'TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '班次/剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.sort == '' || row.sort == 0) {
-    //     this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
-    //     return false
-    //   } else if (row.barid == '') {
-    //     this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.tmrid == '') {
-    //     this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.times == '') {
-    //     this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   }
-    //   if (row.treatmethod !== '' && row.treatmethod == '转投剩料') {
-    //     if (row.useinbarid == '') {
-    //       this.$message({ type: 'error', message: '转投栏舍不能为空', duration: 2000 })
-    //       return false
-    //     }
-    //   }
-    //   if (row.treatmethod !== '' && row.treatmethod == '继续饲喂') {
-    //     row.useinbarid = '0'
-    //   }
-    //   if (row.rtime == '' || row.rtime == null) {
-    //     row.rtime = ''
-    //   }
-    //   for (let i = 0; i < this.table.list.length; i++) {
-    //     if (row.sort == this.table.list[i].sort) {
-    //       if (row.myId !== this.table.list[i].myId) {
-    //         this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
-    //         return false
-    //       }
-    //     }
-    //   }
-
-    //   var isInteger = /^\d+$/
-    //   if (row.sort !== '') {
-    //     if (!isInteger.test(parseFloat(row.sort))) {
-    //       this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
-    //       return false
-    //     }
-    //   }
-    //   this.isokDisable = true
-    //   setTimeout(() => {
-    //     this.isokDisable = false
-    //   }, 1000)
-    //   this.requestParam.common = { 'returnmap': '0' }
-    //   this.requestParam.data = []
-    //   this.requestParam.data[0] = { 'name': 'insertRemainplan', 'type': 'e', 'parammaps': {
-    //     pastureid: Cookies.get('pastureid'),
-    //     sort: row.sort,
-    //     tmrid: row.tmrid,
-    //     tmrcode: row.tmrcode,
-    //     enable: row.enable,
-    //     times: row.times,
-    //     lppid: row.lppid,
-    //     lppcode: row.lppcode,
-    //     rtime: row.rtime,
-    //     treatmethod: row.treatmethod
-    //   }}
-    //   this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-    //   this.requestParam.data[1].children = []
-    //   this.requestParam.data[1].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-    //     pastureid: Cookies.get('pastureid'),
-    //     bigid: '@insertRemainplan.LastInsertId',
-    //     barid: '@insertSpotList.id',
-    //     bar: '@insertSpotList.bname',
-    //     type: 0
-    //   }}
-    //   this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
-    //   this.requestParam.data[2].children = []
-    //   this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-    //     pastureid: Cookies.get('pastureid'),
-    //     bigid: '@insertRemainplan.LastInsertId',
-    //     barid: '@insertSpotList2.id',
-    //     bar: '@insertSpotList2.bname',
-    //     type: 1
-    //   }}
-    //   ExecDataByConfig(this.requestParam).then(response => {
-    //     console.log('新增保存发送参数', this.requestParam)
-    //     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()
-    //       this.dropState = false
-    //     }
-    //   })
-    // },
-
-
-    createData() {
-      console.log('点击了新增保存')
-      this.isokDisable = true
-      setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
-        if (valid) {
-
-
-
-          if (this.create.temp.rtime == null || this.create.temp.rtime == 'null') {
-            this.create.temp.rtime = ''
-          }
-          if (this.create.temp.sort == '' && this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-            this.$message({ type: 'error', message: '车次/栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-            this.$message({ type: 'error', message: '栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-            this.$message({ type: 'error', message: 'TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-            this.$message({ type: 'error', message: '班次/剩料处理方式不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
-            this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
-            return false
-          } else if (this.create.temp.barid == '') {
-            this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.tmrid == '') {
-            this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.times == '') {
-            this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
-            return false
-          } else if (this.create.temp.treatmethod == '') {
-            this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
-            return false
+          if (response.data.list !== null) {
+            this.transferbarsList = response.data.list
           }
-          if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
-            if (this.create.temp.useinbarid == '') {
-              this.$message({ type: 'error', message: '转投栏舍不能为空', duration: 2000 })
+          console.log(this.transferbarsList)
+        })
+      },
+      // // 转头栏舍
+      // changeTransferbars(val) {
+      //   console.log('点击了转头栏舍', val)
+      //   var arr2 = []
+      //   this.transferbarsList.forEach(function(i) {
+      //     val.forEach(function(j) {
+      //       if (i.id == j) { arr2.push(i) }
+      //     })
+      //   })
+      //   this.table.temp2.useinbar = arr2
+      //   this.useinbarNamesIdTempArr = arr2
+      //   this.$forceUpdate()
+      // },
+
+      // 转头栏舍
+      changeTransferbars(val) {
+        console.log('点击了转头栏舍', val)
+        // var arr2 = []
+        // this.transferbarsList.forEach(function(i) {
+        //   val.forEach(function(j) {
+        //     if (i.id == j) { arr2.push(i) }
+        //   })
+        // })
+        // this.table.temp2.useinbar = arr2
+        // // this.useinbarNamesIdTempArr = arr2
+        // this.$forceUpdate()
+      },
+
+      // createData(row) {
+      //   console.log('点击了新增保存', row)
+      //   if (row.rtime == null || row.rtime == 'null') {
+      //     row.rtime = ''
+      //   }
+      //   if (row.sort == '' && row.barid == '' && row.tmrid == '' && row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '车次/栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.barid == '' && row.tmrid == '' && row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.tmrid == '' && row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: 'TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '班次/剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.sort == '' || row.sort == 0) {
+      //     this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+      //     return false
+      //   } else if (row.barid == '') {
+      //     this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.tmrid == '') {
+      //     this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.times == '') {
+      //     this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   }
+      //   if (row.treatmethod !== '' && row.treatmethod == '转投剩料') {
+      //     if (row.useinbarid == '') {
+      //       this.$message({ type: 'error', message: '转投栏舍不能为空', duration: 2000 })
+      //       return false
+      //     }
+      //   }
+      //   if (row.treatmethod !== '' && row.treatmethod == '继续饲喂') {
+      //     row.useinbarid = '0'
+      //   }
+      //   if (row.rtime == '' || row.rtime == null) {
+      //     row.rtime = ''
+      //   }
+      //   for (let i = 0; i < this.table.list.length; i++) {
+      //     if (row.sort == this.table.list[i].sort) {
+      //       if (row.myId !== this.table.list[i].myId) {
+      //         this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+      //         return false
+      //       }
+      //     }
+      //   }
+
+      //   var isInteger = /^\d+$/
+      //   if (row.sort !== '') {
+      //     if (!isInteger.test(parseFloat(row.sort))) {
+      //       this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+      //       return false
+      //     }
+      //   }
+      //   this.isokDisable = true
+      //   setTimeout(() => {
+      //     this.isokDisable = false
+      //   }, 1000)
+      //   this.requestParam.common = { 'returnmap': '0' }
+      //   this.requestParam.data = []
+      //   this.requestParam.data[0] = { 'name': 'insertRemainplan', 'type': 'e', 'parammaps': {
+      //     pastureid: Cookies.get('pastureid'),
+      //     sort: row.sort,
+      //     tmrid: row.tmrid,
+      //     tmrcode: row.tmrcode,
+      //     enable: row.enable,
+      //     times: row.times,
+      //     lppid: row.lppid,
+      //     lppcode: row.lppcode,
+      //     rtime: row.rtime,
+      //     treatmethod: row.treatmethod
+      //   }}
+      //   this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+      //   this.requestParam.data[1].children = []
+      //   this.requestParam.data[1].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+      //     pastureid: Cookies.get('pastureid'),
+      //     bigid: '@insertRemainplan.LastInsertId',
+      //     barid: '@insertSpotList.id',
+      //     bar: '@insertSpotList.bname',
+      //     type: 0
+      //   }}
+      //   this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
+      //   this.requestParam.data[2].children = []
+      //   this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+      //     pastureid: Cookies.get('pastureid'),
+      //     bigid: '@insertRemainplan.LastInsertId',
+      //     barid: '@insertSpotList2.id',
+      //     bar: '@insertSpotList2.bname',
+      //     type: 1
+      //   }}
+      //   ExecDataByConfig(this.requestParam).then(response => {
+      //     console.log('新增保存发送参数', this.requestParam)
+      //     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()
+      //       this.dropState = false
+      //     }
+      //   })
+      // },
+
+
+      createData() {
+        console.log('点击了新增保存')
+        this.isokDisable = true
+        setTimeout(() => {
+          this.isokDisable = false
+        }, 1000)
+        this.$refs['temp'].validate(valid => {
+          if (valid) {
+
+
+
+            if (this.create.temp.rtime == null || this.create.temp.rtime == 'null') {
+              this.create.temp.rtime = ''
+            }
+            if (this.create.temp.sort == '' && this.create.temp.barid == '' && this.create.temp.tmrid == '' && this
+              .create.temp.times == '' && this.create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '车次/栏舍/TMR编号/班次/剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times ==
+              '' && this.create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '栏舍/TMR编号/班次/剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp
+              .treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: 'TMR编号/班次/剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.times == '' && this.create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '班次/剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
+              this.$message({
+                type: 'error',
+                message: '车次不能为空且大于0',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.barid == '') {
+              this.$message({
+                type: 'error',
+                message: '栏舍不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.tmrid == '') {
+              this.$message({
+                type: 'error',
+                message: 'TMR编号不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.times == '') {
+              this.$message({
+                type: 'error',
+                message: '班次不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '剩料处理方式不能为空',
+                duration: 2000
+              })
               return false
             }
-          }
-          if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
-            // this.create.temp.useinbarid = '0'
-            this.create.temp.useinbarid = '0'
-          }
-          if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
-            this.create.temp.rtime = ''
-          }
-          for (let i = 0; i < this.table.list.length; i++) {
-            if (this.create.temp.sort == this.table.list[i].sort) {
-              if (this.create.temp.myId !== this.table.list[i].myId) {
-                this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+            if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
+              if (this.create.temp.useinbarid == '') {
+                this.$message({
+                  type: 'error',
+                  message: '转投栏舍不能为空',
+                  duration: 2000
+                })
                 return false
               }
             }
-          }
+            if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
+              // this.create.temp.useinbarid = '0'
+              this.create.temp.useinbarid = '0'
+            }
+            if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
+              this.create.temp.rtime = ''
+            }
+            for (let i = 0; i < this.table.list.length; i++) {
+              if (this.create.temp.sort == this.table.list[i].sort) {
+                if (this.create.temp.myId !== this.table.list[i].myId) {
+                  this.$message({
+                    type: 'error',
+                    message: '车次不可重复',
+                    duration: 2000
+                  })
+                  return false
+                }
+              }
+            }
 
-          var isInteger = /^\d+$/
-          if (this.create.temp.sort !== '') {
-            if (!isInteger.test(parseFloat(this.create.temp.sort))) {
-              this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
-              return false
+            var isInteger = /^\d+$/
+            if (this.create.temp.sort !== '') {
+              if (!isInteger.test(parseFloat(this.create.temp.sort))) {
+                this.$message({
+                  type: 'error',
+                  message: '车次请输入整数',
+                  duration: 2000
+                })
+                return false
+              }
             }
-          }
 
 
 
-          this.isokDisable = true
-          setTimeout(() => {
-            this.isokDisable = false
-          }, 1000)
+            this.isokDisable = true
+            setTimeout(() => {
+              this.isokDisable = false
+            }, 1000)
 
 
-          console.log(this.create.temp)
+            console.log(this.create.temp)
 
 
-          var ztlasArr = [{"bname": "","id": this.create.temp.useinbarid }]
-      
-          this.transferbarsList.forEach(function(item){
-            if(item.id == ztlasArr[0].id){
-              ztlasArr[0].bname = item.bname
-            }
-          })
+            var ztlasArr = [{
+              "bname": "",
+              "id": this.create.temp.useinbarid
+            }]
 
-          console.log("ztlasArr",ztlasArr)
-
-
-
-
-          var ssss_data = {
-                "common": {
-                    "returnmap": "0"
-                },
-                "data": [
-                    {
-                        "name": "insertRemainplan",
-                        "type": "e",
-                        "parammaps": {
-                          
-                            pastureid: Cookies.get('pastureid'),
-                            sort: this.create.temp.sort,
-                            tmrid: this.create.temp.tmrid,
-                            tmrcode: this.create.temp.tmrcode,
-                            enable: this.create.temp.enable,
-                            times: this.create.temp.times,
-                            lppid: this.create.temp.lppid,
-                            lppcode: this.create.temp.lppcode,
-                            rtime: this.create.temp.rtime,
-                            treatmethod: this.create.temp.treatmethod
-                        }
-                    },
-                    {
-                        "name": "insertSpotList",
-                        "resultmaps": {
-                          'list': this.barsNamesIdTempArr
-                        },
-                        "children": [
-                            {
-                                "name": "insertRpdetail",
-                                "type": "e",
-                                "parammaps": {
-                                    "pastureid":  Cookies.get('pastureid'),
-                                    "bigid": "@insertRemainplan.LastInsertId",
-                                    "barid": "@insertSpotList.id",
-                                    "bar": "@insertSpotList.bname",
-                                    "type": 0
-                                }
-                            }
-                        ]
-                    },
-                    {
-                        "name": "insertRpdetail",
-                        "type": "e",
-                        "parammaps": {
-                            "pastureid": "1647917519",
-                            "bigid": "@insertRemainplan.LastInsertId",
-                            "barid": ztlasArr[0].id,
-                            "bar": ztlasArr[0].bname ,
-                            "type": 1
-                        }
-                    }
-                ]
+            this.transferbarsList.forEach(function(item) {
+              if (item.id == ztlasArr[0].id) {
+                ztlasArr[0].bname = item.bname
+              }
+            })
+
+            console.log("ztlasArr", ztlasArr)
+
+
+
+
+            var ssss_data = {
+              "common": {
+                "returnmap": "0"
+              },
+              "data": [{
+                  "name": "insertRemainplan",
+                  "type": "e",
+                  "parammaps": {
+
+                    pastureid: Cookies.get('pastureid'),
+                    sort: this.create.temp.sort,
+                    tmrid: this.create.temp.tmrid,
+                    tmrcode: this.create.temp.tmrcode,
+                    enable: this.create.temp.enable,
+                    times: this.create.temp.times,
+                    lppid: this.create.temp.lppid,
+                    lppcode: this.create.temp.lppcode,
+                    rtime: this.create.temp.rtime,
+                    treatmethod: this.create.temp.treatmethod
+                  }
+                },
+                {
+                  "name": "insertSpotList",
+                  "resultmaps": {
+                    'list': this.barsNamesIdTempArr
+                  },
+                  "children": [{
+                    "name": "insertRpdetail",
+                    "type": "e",
+                    "parammaps": {
+                      "pastureid": Cookies.get('pastureid'),
+                      "bigid": "@insertRemainplan.LastInsertId",
+                      "barid": "@insertSpotList.id",
+                      "bar": "@insertSpotList.bname",
+                      "type": 0
+                    }
+                  }]
+                },
+                {
+                  "name": "insertRpdetail",
+                  "type": "e",
+                  "parammaps": {
+                    "pastureid": "1647917519",
+                    "bigid": "@insertRemainplan.LastInsertId",
+                    "barid": ztlasArr[0].id,
+                    "bar": ztlasArr[0].bname,
+                    "type": 1
+                  }
+                }
+              ]
             }
 
 
 
 
-          // this.requestParam.common = { 'returnmap': '0' }
-          // this.requestParam.data = []
-          // this.requestParam.data[0] = { 'name': 'insertRemainplan', 'type': 'e', 'parammaps': {
-          //   pastureid: Cookies.get('pastureid'),
-          //   sort: this.create.temp.sort,
-          //   tmrid: this.create.temp.tmrid,
-          //   tmrcode: this.create.temp.tmrcode,
-          //   enable: this.create.temp.enable,
-          //   times: this.create.temp.times,
-          //   lppid: this.create.temp.lppid,
-          //   lppcode: this.create.temp.lppcode,
-          //   rtime: this.create.temp.rtime,
-          //   treatmethod: this.create.temp.treatmethod
-          // }}
-          // this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-          // this.requestParam.data[1].children = []
-          // this.requestParam.data[1].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-          //   pastureid: Cookies.get('pastureid'),
-          //   bigid: '@insertRemainplan.LastInsertId',
-          //   barid: '@insertSpotList.id',
-          //   bar: '@insertSpotList.bname',
-          //   type: 0
-          // }}
-          // this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
-          // this.requestParam.data[2].children = []
-          // this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-          //   pastureid: Cookies.get('pastureid'),
-          //   bigid: '@insertRemainplan.LastInsertId',
-          //   barid: '@insertSpotList2.id',
-          //   bar: '@insertSpotList2.bname',
-          //   type: 1
-          // }}
-
-
-          ExecDataByConfig(ssss_data).then(response => {
-            console.log('新增保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.create.dialogFormVisible = false
-              this.getList()
-              this.dropState = false
-            }
-          })
+            // this.requestParam.common = { 'returnmap': '0' }
+            // this.requestParam.data = []
+            // this.requestParam.data[0] = { 'name': 'insertRemainplan', 'type': 'e', 'parammaps': {
+            //   pastureid: Cookies.get('pastureid'),
+            //   sort: this.create.temp.sort,
+            //   tmrid: this.create.temp.tmrid,
+            //   tmrcode: this.create.temp.tmrcode,
+            //   enable: this.create.temp.enable,
+            //   times: this.create.temp.times,
+            //   lppid: this.create.temp.lppid,
+            //   lppcode: this.create.temp.lppcode,
+            //   rtime: this.create.temp.rtime,
+            //   treatmethod: this.create.temp.treatmethod
+            // }}
+            // this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+            // this.requestParam.data[1].children = []
+            // this.requestParam.data[1].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+            //   pastureid: Cookies.get('pastureid'),
+            //   bigid: '@insertRemainplan.LastInsertId',
+            //   barid: '@insertSpotList.id',
+            //   bar: '@insertSpotList.bname',
+            //   type: 0
+            // }}
+            // this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
+            // this.requestParam.data[2].children = []
+            // this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+            //   pastureid: Cookies.get('pastureid'),
+            //   bigid: '@insertRemainplan.LastInsertId',
+            //   barid: '@insertSpotList2.id',
+            //   bar: '@insertSpotList2.bname',
+            //   type: 1
+            // }}
+
+
+            ExecDataByConfig(ssss_data).then(response => {
+              console.log('新增保存发送参数', this.requestParam)
+              if (response.msg === 'fail') {
+                this.$notify({
+                  title: '保存失败',
+                  message: response.data,
+                  type: 'warning',
+                  duration: 2000
+                })
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '保存成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.create.dialogFormVisible = false
+                this.getList()
+                this.dropState = false
+              }
+            })
+
+
+          }
+        })
+      },
+
 
 
+
+      createCancel(row) {
+        console.log('点击了新增取消')
+        this.dropState = false
+        for (let i = 0; i < this.table.list.length; i++) {
+          if (row.myId === this.table.list[i].myId) {
+            var listIndex = this.table.list.indexOf(this.table.list[i])
+          }
+          if (listIndex > -1) {
+            this.table.list.splice(listIndex, 1)
+            return
+          }
         }
-      })
-    },
+      },
+
+      // 模板编辑
+      // handleUpdate(row) {
+      //   for (let i = 0; i < this.table.list.length; i++) {
+      //     if (this.table.list[i].Edit == true) {
+      //       this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
+      //       return false
+      //     }
+      //   }
+      //   console.log(row, '=========')
+      //   // 编辑true,不可编辑false
+      //   row.Edit = true
+      //   row.NoEdit = false
+      //   // 新增false,编辑false,编辑保存true
+      //   row.isCreate = false
+      //   row.isUpdate = false
+      //   row.isUpdateSave = true
+      //   row.temp = {}
+      //   row.temp2 = {}
+      //   if (row.useinbarid == '0') { row.useinbarid = [] }
+      //   if (row.barid == undefined) { row.barid = [] }
+      //   if (row.tmrid == undefined) { row.tmrid = '' }
+      //   if (row.times == undefined) { row.times = '' }
+
+      //   if (row.treatmethod == undefined) { row.treatmethod = '' }
+      //   // this.getCarFollowParm.parammaps.times = row.times
+      //   if (row.times == '第一班') {
+      //     this.getCarFollowParm.parammaps.times = 1
+      //     row.times = '1'
+      //   } else if (row.times == '第二班') {
+      //     this.getCarFollowParm.parammaps.times = 2
+      //     row.times = '2'
+      //   } else if (row.times == '第三班') {
+      //     this.getCarFollowParm.parammaps.times = 3
+      //     row.times = '3'
+      //   } else if (row.times == '第四班') {
+      //     this.getCarFollowParm.parammaps.times = 4
+      //     row.times = '4'
+      //   } else if (row.times == '第五班') {
+      //     this.getCarFollowParm.parammaps.times = 5
+      //     row.times = '5'
+      //   }
+      //   GetDataByName(this.getCarFollowParm).then(response => {
+      //     console.log('撒料计划车次跟随列表数据', response.data.list)
+      //     if (response.data.list !== null) {
+      //       this.carFollowList = response.data.list
+      //     }
+      //   })
+      //   console.log(row, '====')
+      //   if (row.lppcode == undefined) {
+      //     this.$set(row, 'lppid', '')
+      //   }
 
+      //   this.getTransferbarsList()
+      //   // row.barid = row.qstrids.split(',')
+      //   // row.useinbarid = row.hstrids.split(',')
+      //   var arr3 = []
+      //   for (let i = 0; i < row.barid.length; i++) {
+      //     arr3.push(this.barsList.find(obj => obj.id == row.barid[i]))
+      //   }
+      //   this.barsNamesIdTempArr = arr3
+      //   var arr4 = []
+      //   setTimeout(() => {
+      //     for (let i = 0; i < row.useinbarid.length; i++) {
+      //       arr4.push(this.transferbarsList.find(obj => obj.id == row.useinbarid[i]))
+      //     }
+      //   }, 500)
+      //   this.useinbarNamesIdTempArr = arr4
+      //   console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr')
+      //   this.dropState = true
+      // },
+
+
+      // 编辑
+      handleUpdate(row) {
+        console.log('点击了编辑', row)
+        this.create.dialogStatus = 'update'
+        this.dialogFull = false
+        this.create.dialogFormVisible = true
+        this.getCarFollowParm.parammaps.times = row.times
+        this.getCarFollowList()
+
+        row.temp = {}
+        row.temp2 = {}
+
+
+        if (row.treatmethod == "继续饲喂") {
+          this.isDis = true
+        } else {
+          this.isDis = false
+        }
 
 
 
-    createCancel(row) {
-      console.log('点击了新增取消')
-      this.dropState = false
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (row.myId === this.table.list[i].myId) {
-          var listIndex = this.table.list.indexOf(this.table.list[i])
+        // if (row.useinbarid == '0') { row.useinbarid = "" }
+        if (row.barid == undefined) {
+          row.barid = []
         }
-        if (listIndex > -1) {
-          this.table.list.splice(listIndex, 1)
-          return
+        if (row.tmrid == undefined) {
+          row.tmrid = ''
+        }
+        if (row.times == undefined) {
+          row.times = ''
         }
-      }
-    },
 
-    // 模板编辑
-    // handleUpdate(row) {
-    //   for (let i = 0; i < this.table.list.length; i++) {
-    //     if (this.table.list[i].Edit == true) {
-    //       this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
-    //       return false
-    //     }
-    //   }
-    //   console.log(row, '=========')
-    //   // 编辑true,不可编辑false
-    //   row.Edit = true
-    //   row.NoEdit = false
-    //   // 新增false,编辑false,编辑保存true
-    //   row.isCreate = false
-    //   row.isUpdate = false
-    //   row.isUpdateSave = true
-    //   row.temp = {}
-    //   row.temp2 = {}
-    //   if (row.useinbarid == '0') { row.useinbarid = [] }
-    //   if (row.barid == undefined) { row.barid = [] }
-    //   if (row.tmrid == undefined) { row.tmrid = '' }
-    //   if (row.times == undefined) { row.times = '' }
-
-    //   if (row.treatmethod == undefined) { row.treatmethod = '' }
-    //   // this.getCarFollowParm.parammaps.times = row.times
-    //   if (row.times == '第一班') {
-    //     this.getCarFollowParm.parammaps.times = 1
-    //     row.times = '1'
-    //   } else if (row.times == '第二班') {
-    //     this.getCarFollowParm.parammaps.times = 2
-    //     row.times = '2'
-    //   } else if (row.times == '第三班') {
-    //     this.getCarFollowParm.parammaps.times = 3
-    //     row.times = '3'
-    //   } else if (row.times == '第四班') {
-    //     this.getCarFollowParm.parammaps.times = 4
-    //     row.times = '4'
-    //   } else if (row.times == '第五班') {
-    //     this.getCarFollowParm.parammaps.times = 5
-    //     row.times = '5'
-    //   }
-    //   GetDataByName(this.getCarFollowParm).then(response => {
-    //     console.log('撒料计划车次跟随列表数据', response.data.list)
-    //     if (response.data.list !== null) {
-    //       this.carFollowList = response.data.list
-    //     }
-    //   })
-    //   console.log(row, '====')
-    //   if (row.lppcode == undefined) {
-    //     this.$set(row, 'lppid', '')
-    //   }
-
-    //   this.getTransferbarsList()
-    //   // row.barid = row.qstrids.split(',')
-    //   // row.useinbarid = row.hstrids.split(',')
-    //   var arr3 = []
-    //   for (let i = 0; i < row.barid.length; i++) {
-    //     arr3.push(this.barsList.find(obj => obj.id == row.barid[i]))
-    //   }
-    //   this.barsNamesIdTempArr = arr3
-    //   var arr4 = []
-    //   setTimeout(() => {
-    //     for (let i = 0; i < row.useinbarid.length; i++) {
-    //       arr4.push(this.transferbarsList.find(obj => obj.id == row.useinbarid[i]))
-    //     }
-    //   }, 500)
-    //   this.useinbarNamesIdTempArr = arr4
-    //   console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr')
-    //   this.dropState = true
-    // },
-
-
-     // 编辑
-    handleUpdate(row) {
-      console.log('点击了编辑', row)
-      this.create.dialogStatus = 'update'
-      this.dialogFull = false
-      this.create.dialogFormVisible = true
-      this.getCarFollowParm.parammaps.times = row.times
-      this.getCarFollowList()
-
-      row.temp = {}
-      row.temp2 = {}
-
-
-      if(row.treatmethod == "继续饲喂"){
-        this.isDis = true
-      } else {
-         this.isDis = false
-      }
+        if (row.treatmethod == undefined) {
+          row.treatmethod = ''
+        }
+        // this.getCarFollowParm.parammaps.times = row.times
+        if (row.times == '第一班') {
+          this.getCarFollowParm.parammaps.times = 1
+          row.times = '1'
+        } else if (row.times == '第二班') {
+          this.getCarFollowParm.parammaps.times = 2
+          row.times = '2'
+        } else if (row.times == '第三班') {
+          this.getCarFollowParm.parammaps.times = 3
+          row.times = '3'
+        } else if (row.times == '第四班') {
+          this.getCarFollowParm.parammaps.times = 4
+          row.times = '4'
+        } else if (row.times == '第五班') {
+          this.getCarFollowParm.parammaps.times = 5
+          row.times = '5'
+        }
+        GetDataByName(this.getCarFollowParm).then(response => {
+          console.log('撒料计划车次跟随列表数据', response.data.list)
+          if (response.data.list !== null) {
+            this.carFollowList = response.data.list
+          }
+        })
+        console.log(row, '====')
+        if (row.lppcode == undefined) {
+          this.$set(row, 'lppid', '')
+        }
 
+        this.getTransferbarsList()
+        row.barid = row.qstrids.split(',')
+        row.useinbarid = row.hstrids
 
+        if (row.useinbarid == '0') {
+          row.useinbarid = ""
+        }
 
-      // if (row.useinbarid == '0') { row.useinbarid = "" }
-      if (row.barid == undefined) { row.barid = [] }
-      if (row.tmrid == undefined) { row.tmrid = '' }
-      if (row.times == undefined) { row.times = '' }
-
-      if (row.treatmethod == undefined) { row.treatmethod = '' }
-      // this.getCarFollowParm.parammaps.times = row.times
-      if (row.times == '第一班') {
-        this.getCarFollowParm.parammaps.times = 1
-        row.times = '1'
-      } else if (row.times == '第二班') {
-        this.getCarFollowParm.parammaps.times = 2
-        row.times = '2'
-      } else if (row.times == '第三班') {
-        this.getCarFollowParm.parammaps.times = 3
-        row.times = '3'
-      } else if (row.times == '第四班') {
-        this.getCarFollowParm.parammaps.times = 4
-        row.times = '4'
-      } else if (row.times == '第五班') {
-        this.getCarFollowParm.parammaps.times = 5
-        row.times = '5'
-      }
-      GetDataByName(this.getCarFollowParm).then(response => {
-        console.log('撒料计划车次跟随列表数据', response.data.list)
-        if (response.data.list !== null) {
-          this.carFollowList = response.data.list
+        var arr3 = []
+        for (let i = 0; i < row.barid.length; i++) {
+          arr3.push(this.barsList.find(obj => obj.id == row.barid[i]))
         }
-      })
-      console.log(row, '====')
-      if (row.lppcode == undefined) {
-        this.$set(row, 'lppid', '')
-      }
+        this.barsNamesIdTempArr = arr3
+        this.barSortList = arr3
+        var arr4 = []
 
-      this.getTransferbarsList()
-      row.barid = row.qstrids.split(',')
-      row.useinbarid = row.hstrids 
 
-       if (row.useinbarid == '0') { row.useinbarid = "" }
+        // setTimeout(() => {
+        //   for (let i = 0; i < row.useinbarid.length; i++) {
+        //     arr4.push(this.transferbarsList.find(obj => obj.id == row.useinbarid[i]))
+        //   }
+        // }, 500)
 
-      var arr3 = []
-      for (let i = 0; i < row.barid.length; i++) {
-        arr3.push(this.barsList.find(obj => obj.id == row.barid[i]))
-      }
-      this.barsNamesIdTempArr = arr3
-      this.barSortList = arr3
-      var arr4 = []
 
 
-      // setTimeout(() => {
-      //   for (let i = 0; i < row.useinbarid.length; i++) {
-      //     arr4.push(this.transferbarsList.find(obj => obj.id == row.useinbarid[i]))
-      //   }
-      // }, 500)
+        // this.useinbarNamesIdTempArr = arr4
+        // console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr')
+        this.dropState = true
 
 
+        this.create.temp = Object.assign({}, row)
 
-      // this.useinbarNamesIdTempArr = arr4
-      // console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr')
-      this.dropState = true
 
 
-      this.create.temp = Object.assign({}, row)
 
 
 
 
 
 
+      },
 
 
 
-    },
 
 
 
+      // updateData(row) {
+      //   console.log('点击了编辑保存', row)
+      //   console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr========')
+      //   if (row.rtime == null || row.rtime == 'null') {
+      //     row.rtime = ''
+      //   }
+      //   if (row.barid == '' && row.tmrid == '' && row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.tmrid == '' && row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: 'TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.times == '' && row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '班次/混剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.barid == '') {
+      //     this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.tmrid == '') {
+      //     this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.times == '') {
+      //     this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+      //     return false
+      //   } else if (row.treatmethod == '') {
+      //     this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
+      //     return false
+      //   }
+      //   if (row.treatmethod !== '' && row.treatmethod == '转投剩料') {
+      //     if (row.useinbarid == '') {
+      //       this.$message({ type: 'error', message: '转投栏舍不能为空', duration: 2000 })
+      //       return false
+      //     }
+      //   }
+      //   if (row.treatmethod !== '' && row.treatmethod == '继续饲喂') {
+      //     row.useinbarid = '0'
+      //   }
+      //   if (row.rtime == '' || row.rtime == null) {
+      //     row.rtime = ''
+      //   }
+      //   for (let i = 0; i < this.table.list.length; i++) {
+      //     if (row.sort == this.table.list[i].sort) {
+      //       if (row.id !== this.table.list[i].id) {
+      //         this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+      //         return false
+      //       }
+      //     }
+      //   }
+      //   var isInteger = /^\d+$/
+      //   if (row.sort !== '') {
+      //     if (!isInteger.test(parseFloat(row.sort))) {
+      //       this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+      //       return false
+      //     }
+      //   }
+      //   if (row.sort == '' || row.sort == 0) {
+      //     this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+      //     return false
+      //   }
+      //   if (row.times == '第一班') {
+      //     row.times = 1
+      //   } else if (row.times == '第二班') {
+      //     row.times = 2
+      //   } else if (row.times == '第三班') {
+      //     row.times = 3
+      //   } else if (row.times == '第四班') {
+      //     row.times = 4
+      //   } else if (row.times == '第五班') {
+      //     row.times = 5
+      //   }
+      //   this.isokDisable = true
+      //   setTimeout(() => {
+      //     this.isokDisable = false
+      //   }, 1000)
+      //   this.requestParam = {}
+      //   this.requestParam.common = { 'returnmap': '0' }
+      //   this.requestParam.data = []
+      //   this.requestParam.data[0] = { 'name': 'updateRemainplan', 'type': 'e', 'parammaps': {
+      //     pastureid: row.pastureid,
+      //     id: row.id,
+      //     sort: row.sort,
+      //     tmrid: row.tmrid,
+      //     tmrcode: row.tmrcode,
+      //     enable: row.enable,
+      //     times: row.times,
+      //     lppid: row.lppid,
+      //     lppcode: row.lppcode,
+      //     rtime: row.rtime,
+      //     treatmethod: row.treatmethod
+      //   }}
+      //   this.requestParam.data[1] = { 'name': 'deleteRpdetail', 'type': 'e', 'parammaps': {
+      //     pastureid: row.pastureid,
+      //     bigid: row.id
+      //   }}
+      //   this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+      //   this.requestParam.data[2].children = []
+      //   this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+      //     pastureid: row.pastureid,
+      //     bigid: row.id,
+      //     barid: '@insertSpotList2.id',
+      //     bar: '@insertSpotList2.bname',
+      //     type: 0
+      //   }}
+      //   this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
+      //   this.requestParam.data[3].children = []
+      //   this.requestParam.data[3].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+      //     pastureid: row.pastureid,
+      //     bigid: row.id,
+      //     barid: '@insertSpotList3.id',
+      //     bar: '@insertSpotList3.bname',
+      //     type: 1
+      //   }}
+      //   ExecDataByConfig(this.requestParam).then(response => {
+      //     console.log('新增保存发送参数', this.requestParam)
+      //     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()
+      //       this.dropState = false
+      //     }
+      //   })
 
+      // },
 
 
-    // updateData(row) {
-    //   console.log('点击了编辑保存', row)
-    //   console.log(this.useinbarNamesIdTempArr, 'this.useinbarNamesIdTempArr========')
-    //   if (row.rtime == null || row.rtime == 'null') {
-    //     row.rtime = ''
-    //   }
-    //   if (row.barid == '' && row.tmrid == '' && row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.tmrid == '' && row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: 'TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.times == '' && row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '班次/混剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.barid == '') {
-    //     this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.tmrid == '') {
-    //     this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.times == '') {
-    //     this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
-    //     return false
-    //   } else if (row.treatmethod == '') {
-    //     this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
-    //     return false
-    //   }
-    //   if (row.treatmethod !== '' && row.treatmethod == '转投剩料') {
-    //     if (row.useinbarid == '') {
-    //       this.$message({ type: 'error', message: '转投栏舍不能为空', duration: 2000 })
-    //       return false
-    //     }
-    //   }
-    //   if (row.treatmethod !== '' && row.treatmethod == '继续饲喂') {
-    //     row.useinbarid = '0'
-    //   }
-    //   if (row.rtime == '' || row.rtime == null) {
-    //     row.rtime = ''
-    //   }
-    //   for (let i = 0; i < this.table.list.length; i++) {
-    //     if (row.sort == this.table.list[i].sort) {
-    //       if (row.id !== this.table.list[i].id) {
-    //         this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
-    //         return false
-    //       }
-    //     }
-    //   }
-    //   var isInteger = /^\d+$/
-    //   if (row.sort !== '') {
-    //     if (!isInteger.test(parseFloat(row.sort))) {
-    //       this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
-    //       return false
-    //     }
-    //   }
-    //   if (row.sort == '' || row.sort == 0) {
-    //     this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
-    //     return false
-    //   }
-    //   if (row.times == '第一班') {
-    //     row.times = 1
-    //   } else if (row.times == '第二班') {
-    //     row.times = 2
-    //   } else if (row.times == '第三班') {
-    //     row.times = 3
-    //   } else if (row.times == '第四班') {
-    //     row.times = 4
-    //   } else if (row.times == '第五班') {
-    //     row.times = 5
-    //   }
-    //   this.isokDisable = true
-    //   setTimeout(() => {
-    //     this.isokDisable = false
-    //   }, 1000)
-    //   this.requestParam = {}
-    //   this.requestParam.common = { 'returnmap': '0' }
-    //   this.requestParam.data = []
-    //   this.requestParam.data[0] = { 'name': 'updateRemainplan', 'type': 'e', 'parammaps': {
-    //     pastureid: row.pastureid,
-    //     id: row.id,
-    //     sort: row.sort,
-    //     tmrid: row.tmrid,
-    //     tmrcode: row.tmrcode,
-    //     enable: row.enable,
-    //     times: row.times,
-    //     lppid: row.lppid,
-    //     lppcode: row.lppcode,
-    //     rtime: row.rtime,
-    //     treatmethod: row.treatmethod
-    //   }}
-    //   this.requestParam.data[1] = { 'name': 'deleteRpdetail', 'type': 'e', 'parammaps': {
-    //     pastureid: row.pastureid,
-    //     bigid: row.id
-    //   }}
-    //   this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-    //   this.requestParam.data[2].children = []
-    //   this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-    //     pastureid: row.pastureid,
-    //     bigid: row.id,
-    //     barid: '@insertSpotList2.id',
-    //     bar: '@insertSpotList2.bname',
-    //     type: 0
-    //   }}
-    //   this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
-    //   this.requestParam.data[3].children = []
-    //   this.requestParam.data[3].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-    //     pastureid: row.pastureid,
-    //     bigid: row.id,
-    //     barid: '@insertSpotList3.id',
-    //     bar: '@insertSpotList3.bname',
-    //     type: 1
-    //   }}
-    //   ExecDataByConfig(this.requestParam).then(response => {
-    //     console.log('新增保存发送参数', this.requestParam)
-    //     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()
-    //       this.dropState = false
-    //     }
-    //   })
-
-    // },
-
-
-
-     updateData() {
-      console.log('点击了编辑保存')
-      this.isokDisable = true
-      setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
-        if (valid) {
-           if (this.create.temp.rtime == null || this.create.temp.rtime == 'null') {
-          this.create.temp.rtime = ''
-        }
-        if (this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-          this.$message({ type: 'error', message: '栏舍/TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-          return false
-        } else if (this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-          this.$message({ type: 'error', message: 'TMR编号/班次/剩料处理方式不能为空', duration: 2000 })
-          return false
-        } else if (this.create.temp.times == '' && this.create.temp.treatmethod == '') {
-          this.$message({ type: 'error', message: '班次/混剩料处理方式不能为空', duration: 2000 })
-          return false
-        } else if (this.create.temp.barid == '') {
-          this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
-          return false
-        } else if (this.create.temp.tmrid == '') {
-          this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
-          return false
-        } else if (this.create.temp.times == '') {
-          this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
-          return false
-        } else if (this.create.temp.treatmethod == '') {
-          this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
-          return false
-        }
-        if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
-          if (this.create.temp.useinbarid == '') {
-            this.$message({ type: 'error', message: '转投栏舍不能为空', duration: 2000 })
-            return false
-          }
-        }
-        if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
-          this.create.temp.useinbarid = '0'
-        }
-        if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
-          this.create.temp.rtime = ''
-        }
-        for (let i = 0; i < this.table.list.length; i++) {
-          if (this.create.temp.sort == this.table.list[i].sort) {
-            if (this.create.temp.id !== this.table.list[i].id) {
-              this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
-              return false
-            }
-          }
-        }
-        var isInteger = /^\d+$/
-        if (this.create.temp.sort !== '') {
-          if (!isInteger.test(parseFloat(this.create.temp.sort))) {
-            this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
-            return false
-          }
-        }
-        if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
-          this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
-          return false
-        }
-        if (this.create.temp.times == '第一班') {
-          this.create.temp.times = 1
-        } else if (this.create.temp.times == '第二班') {
-          this.create.temp.times = 2
-        } else if (this.create.temp.times == '第三班') {
-          this.create.temp.times = 3
-        } else if (this.create.temp.times == '第四班') {
-          this.create.temp.times = 4
-        } else if (this.create.temp.times == '第五班') {
-          this.create.temp.times = 5
-        }
+
+      updateData() {
+        console.log('点击了编辑保存')
         this.isokDisable = true
         setTimeout(() => {
           this.isokDisable = false
         }, 1000)
+        this.$refs['temp'].validate(valid => {
+          if (valid) {
+            if (this.create.temp.rtime == null || this.create.temp.rtime == 'null') {
+              this.create.temp.rtime = ''
+            }
+            if (this.create.temp.barid == '' && this.create.temp.tmrid == '' && this.create.temp.times == '' && this
+              .create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '栏舍/TMR编号/班次/剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.tmrid == '' && this.create.temp.times == '' && this.create.temp
+              .treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: 'TMR编号/班次/剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.times == '' && this.create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '班次/混剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.barid == '') {
+              this.$message({
+                type: 'error',
+                message: '栏舍不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.tmrid == '') {
+              this.$message({
+                type: 'error',
+                message: 'TMR编号不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.times == '') {
+              this.$message({
+                type: 'error',
+                message: '班次不能为空',
+                duration: 2000
+              })
+              return false
+            } else if (this.create.temp.treatmethod == '') {
+              this.$message({
+                type: 'error',
+                message: '剩料处理方式不能为空',
+                duration: 2000
+              })
+              return false
+            }
+            if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
+              if (this.create.temp.useinbarid == '') {
+                this.$message({
+                  type: 'error',
+                  message: '转投栏舍不能为空',
+                  duration: 2000
+                })
+                return false
+              }
+            }
+            if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '继续饲喂') {
+              this.create.temp.useinbarid = '0'
+            }
+            if (this.create.temp.rtime == '' || this.create.temp.rtime == null) {
+              this.create.temp.rtime = ''
+            }
+            for (let i = 0; i < this.table.list.length; i++) {
+              if (this.create.temp.sort == this.table.list[i].sort) {
+                if (this.create.temp.id !== this.table.list[i].id) {
+                  this.$message({
+                    type: 'error',
+                    message: '车次不可重复',
+                    duration: 2000
+                  })
+                  return false
+                }
+              }
+            }
+            var isInteger = /^\d+$/
+            if (this.create.temp.sort !== '') {
+              if (!isInteger.test(parseFloat(this.create.temp.sort))) {
+                this.$message({
+                  type: 'error',
+                  message: '车次请输入整数',
+                  duration: 2000
+                })
+                return false
+              }
+            }
+            if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
+              this.$message({
+                type: 'error',
+                message: '车次不能为空且大于0',
+                duration: 2000
+              })
+              return false
+            }
+            if (this.create.temp.times == '第一班') {
+              this.create.temp.times = 1
+            } else if (this.create.temp.times == '第二班') {
+              this.create.temp.times = 2
+            } else if (this.create.temp.times == '第三班') {
+              this.create.temp.times = 3
+            } else if (this.create.temp.times == '第四班') {
+              this.create.temp.times = 4
+            } else if (this.create.temp.times == '第五班') {
+              this.create.temp.times = 5
+            }
+            this.isokDisable = true
+            setTimeout(() => {
+              this.isokDisable = false
+            }, 1000)
 
 
-         var ztlasArr2 = [{"bname": "","id": this.create.temp.useinbarid }]
-      
-          this.transferbarsList.forEach(function(item){
-            if(item.id == ztlasArr2[0].id){
-              ztlasArr2[0].bname = item.bname
-            }
-          })
+            var ztlasArr2 = [{
+              "bname": "",
+              "id": this.create.temp.useinbarid
+            }]
 
-          console.log("ztlasArr2",ztlasArr2)
-
-
-
-
-        var ssss_data2 = {
-            "common": {
-                "returnmap": "0"
-            },
-            "data": [
-                {
-                    "name": "updateRemainplan",
-                    "type": "e",
-                    "parammaps": {
-                             pastureid: this.create.temp.pastureid,
-                          id: this.create.temp.id,
-                          sort: this.create.temp.sort,
-                          tmrid: this.create.temp.tmrid,
-                          tmrcode: this.create.temp.tmrcode,
-                          enable: this.create.temp.enable,
-                          times: this.create.temp.times,
-                          lppid: this.create.temp.lppid,
-                          lppcode: this.create.temp.lppcode,
-                          rtime: this.create.temp.rtime,
-                          treatmethod: this.create.temp.treatmethod
-                    }
-                },
-                {
-                    "name": "deleteRpdetail",
-                    "type": "e",
-                    "parammaps": {
-                        pastureid: this.create.temp.pastureid,
-                      bigid: this.create.temp.id
-                    }
-                },
-                {
-                    "name": "insertSpotList2",
-                    "resultmaps": {
-                        "list":  this.barsNamesIdTempArr
-                        
-                    },
-                    "children": [
-                        {
-                            "name": "insertRpdetail",
-                            "type": "e",
-                            "parammaps": {
-                                     pastureid: this.create.temp.pastureid,
-                                  bigid: this.create.temp.id,
-                                "barid": "@insertSpotList2.id",
-                                "bar": "@insertSpotList2.bname",
-                                "type": 0
-                            }
-                        }
-                    ]
-                },
-                {
-                    "name": "insertRpdetail",
-                    "type": "e",
-                    "parammaps": {
-                        "pastureid": this.create.temp.pastureid,
-                        "bigid": this.create.temp.id,
-                       
-      "barid":ztlasArr2[0].id,
-                            "bar":ztlasArr2[0].bname ,
-                        "type": 1
-                    }
-                }
-            ]
-        }
+            this.transferbarsList.forEach(function(item) {
+              if (item.id == ztlasArr2[0].id) {
+                ztlasArr2[0].bname = item.bname
+              }
+            })
+
+            console.log("ztlasArr2", ztlasArr2)
+
+
+
+
+            var ssss_data2 = {
+              "common": {
+                "returnmap": "0"
+              },
+              "data": [{
+                  "name": "updateRemainplan",
+                  "type": "e",
+                  "parammaps": {
+                    pastureid: this.create.temp.pastureid,
+                    id: this.create.temp.id,
+                    sort: this.create.temp.sort,
+                    tmrid: this.create.temp.tmrid,
+                    tmrcode: this.create.temp.tmrcode,
+                    enable: this.create.temp.enable,
+                    times: this.create.temp.times,
+                    lppid: this.create.temp.lppid,
+                    lppcode: this.create.temp.lppcode,
+                    rtime: this.create.temp.rtime,
+                    treatmethod: this.create.temp.treatmethod
+                  }
+                },
+                {
+                  "name": "deleteRpdetail",
+                  "type": "e",
+                  "parammaps": {
+                    pastureid: this.create.temp.pastureid,
+                    bigid: this.create.temp.id
+                  }
+                },
+                {
+                  "name": "insertSpotList2",
+                  "resultmaps": {
+                    "list": this.barsNamesIdTempArr
+
+                  },
+                  "children": [{
+                    "name": "insertRpdetail",
+                    "type": "e",
+                    "parammaps": {
+                      pastureid: this.create.temp.pastureid,
+                      bigid: this.create.temp.id,
+                      "barid": "@insertSpotList2.id",
+                      "bar": "@insertSpotList2.bname",
+                      "type": 0
+                    }
+                  }]
+                },
+                {
+                  "name": "insertRpdetail",
+                  "type": "e",
+                  "parammaps": {
+                    "pastureid": this.create.temp.pastureid,
+                    "bigid": this.create.temp.id,
+
+                    "barid": ztlasArr2[0].id,
+                    "bar": ztlasArr2[0].bname,
+                    "type": 1
+                  }
+                }
+              ]
+            }
 
 
-       
-
-
-
-        // this.requestParam = {}
-        // this.requestParam.common = { 'returnmap': '0' }
-        // this.requestParam.data = []
-        // this.requestParam.data[0] = { 'name': 'updateRemainplan', 'type': 'e', 'parammaps': {
-        //   pastureid: this.create.temp.pastureid,
-        //   id: this.create.temp.id,
-        //   sort: this.create.temp.sort,
-        //   tmrid: this.create.temp.tmrid,
-        //   tmrcode: this.create.temp.tmrcode,
-        //   enable: this.create.temp.enable,
-        //   times: this.create.temp.times,
-        //   lppid: this.create.temp.lppid,
-        //   lppcode: this.create.temp.lppcode,
-        //   rtime: this.create.temp.rtime,
-        //   treatmethod: this.create.temp.treatmethod
-        // }}
-        // this.requestParam.data[1] = { 'name': 'deleteRpdetail', 'type': 'e', 'parammaps': {
-        //   pastureid: this.create.temp.pastureid,
-        //   bigid: this.create.temp.id
-        // }}
-        // this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-        // this.requestParam.data[2].children = []
-        // this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-        //   pastureid: this.create.temp.pastureid,
-        //   bigid: this.create.temp.id,
-        //   barid: '@insertSpotList2.id',
-        //   bar: '@insertSpotList2.bname',
-        //   type: 0
-        // }}
-        // // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
-
-        // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
-
-        // this.requestParam.data[3].children = []
-        // this.requestParam.data[3].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
-        //   pastureid: this.create.temp.pastureid,
-        //   bigid: this.create.temp.id,
-        //   barid: '@insertSpotList3.id',
-        //   bar: '@insertSpotList3.bname',
-        //   type: 1
-        // }}
-
-        
-        ExecDataByConfig(ssss_data2).then(response => {
-          console.log('保存发送参数', this.requestParam)
-          if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-          } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-            this.create.dialogFormVisible = false
-            this.getList()
-            this.dropState = false
-          }
-        })
 
-        }
-      })
-    },
 
 
 
-    updateCancel(row) {
-      console.log('点击了编辑取消')
-      // 编辑false,不可编辑true
-      row.Edit = false
-      row.NoEdit = true
-      // 新增false,编辑true,编辑保存false
-      row.isCreate = false
-      row.isUpdate = true
-      row.isUpdateSave = false
-      this.getList()
-      this.dropState = false
-    },
+            // this.requestParam = {}
+            // this.requestParam.common = { 'returnmap': '0' }
+            // this.requestParam.data = []
+            // this.requestParam.data[0] = { 'name': 'updateRemainplan', 'type': 'e', 'parammaps': {
+            //   pastureid: this.create.temp.pastureid,
+            //   id: this.create.temp.id,
+            //   sort: this.create.temp.sort,
+            //   tmrid: this.create.temp.tmrid,
+            //   tmrcode: this.create.temp.tmrcode,
+            //   enable: this.create.temp.enable,
+            //   times: this.create.temp.times,
+            //   lppid: this.create.temp.lppid,
+            //   lppcode: this.create.temp.lppcode,
+            //   rtime: this.create.temp.rtime,
+            //   treatmethod: this.create.temp.treatmethod
+            // }}
+            // this.requestParam.data[1] = { 'name': 'deleteRpdetail', 'type': 'e', 'parammaps': {
+            //   pastureid: this.create.temp.pastureid,
+            //   bigid: this.create.temp.id
+            // }}
+            // this.requestParam.data[2] = { 'name': 'insertSpotList2', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+            // this.requestParam.data[2].children = []
+            // this.requestParam.data[2].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+            //   pastureid: this.create.temp.pastureid,
+            //   bigid: this.create.temp.id,
+            //   barid: '@insertSpotList2.id',
+            //   bar: '@insertSpotList2.bname',
+            //   type: 0
+            // }}
+            // // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.useinbarNamesIdTempArr }}
+
+            // this.requestParam.data[3] = { 'name': 'insertSpotList3', 'resultmaps': { 'list': this.barsNamesIdTempArr }}
+
+            // this.requestParam.data[3].children = []
+            // this.requestParam.data[3].children[0] = { 'name': 'insertRpdetail', 'type': 'e', 'parammaps': {
+            //   pastureid: this.create.temp.pastureid,
+            //   bigid: this.create.temp.id,
+            //   barid: '@insertSpotList3.id',
+            //   bar: '@insertSpotList3.bname',
+            //   type: 1
+            // }}
+
+
+            ExecDataByConfig(ssss_data2).then(response => {
+              console.log('保存发送参数', this.requestParam)
+              if (response.msg === 'fail') {
+                this.$notify({
+                  title: '保存失败',
+                  message: response.data,
+                  type: 'warning',
+                  duration: 2000
+                })
+              } else {
+                this.$notify({
+                  title: '成功',
+                  message: '保存成功',
+                  type: 'success',
+                  duration: 2000
+                })
+                this.create.dialogFormVisible = false
+                this.getList()
+                this.dropState = false
+              }
+            })
 
-    handleSelect(val) {
-      console.log('勾选数据', val)
-      this.selectList = val
-    },
-    // 行内删除
-    handleRowDelete(row) {
-      console.log(row, '点击了行删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        this.selectList = []
-        this.requestParam = {}
-        this.requestParam.name = 'deleteRemainplan'
-        this.requestParam.parammaps = {}
-        this.requestParam.parammaps.pastureid = row.pastureid
-        this.requestParam.parammaps.id = row.id
-        PostDataByName(this.requestParam).then(response => {
-          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()
           }
         })
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
-      })
-    },
-    // 减少车次
-    handleDelete() {
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
-      } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      },
+
+
+
+      updateCancel(row) {
+        console.log('点击了编辑取消')
+        // 编辑false,不可编辑true
+        row.Edit = false
+        row.NoEdit = true
+        // 新增false,编辑true,编辑保存false
+        row.isCreate = false
+        row.isUpdate = true
+        row.isUpdateSave = false
+        this.getList()
+        this.dropState = false
+      },
+
+      handleSelect(val) {
+        console.log('勾选数据', val)
+        this.selectList = val
+      },
+      // 行内删除
+      handleRowDelete(row) {
+        console.log(row, '点击了行删除')
+        MessageBox.confirm('是否确认删除此信息?', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
         }).then(() => {
-          console.log(this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'deleteRemainplan', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('删除保存发送参数', this.requestParam)
+          this.selectList = []
+          this.requestParam = {}
+          this.requestParam.name = 'deleteRemainplan'
+          this.requestParam.parammaps = {}
+          this.requestParam.parammaps.pastureid = row.pastureid
+          this.requestParam.parammaps.id = row.id
+          PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({
+                title: '删除失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
+              this.$notify({
+                title: '成功',
+                message: '删除成功',
+                type: 'success',
+                duration: 2000
+              })
               this.getList()
             }
           })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          })
         })
-      }
-    },
-    // 校验
-    handleCheck() {
-      console.log('点击了校验')
-      this.check.dialogStatus = 'check'
-      this.check.dialogFormVisible = true
-      this.getCheckList()
-    },
-    getCheckList() {
-      GetDataByName(this.check.getCheckParm).then(response => {
-        if (response.data.list[0].bnames !== undefined) {
-          this.check.temp.isDistribution = 0
-          this.check.temp.bnames = response.data.list[0].bnames
-        } else {
-          this.check.temp = {}
-          this.check.temp.isDistribution = 1
-        }
-      })
-    },
-    // 历史记录
-    handleHistoryRecords() {
-      console.log('点击了历史记录')
-      this.dialogFull = false
-      this.history.dialogStatus = 'history'
-      this.history.dialogFormVisible = true
-      this.getDateList()
-    },
-    // 历史时间
-    getDateList() {
-      GetDataByName(this.history.getdataDateParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.history.getdataListParm.parammaps.date = response.data.list[0].maxdate
-          this.getHistoryList()
+      },
+      // 减少车次
+      handleDelete() {
+        if (this.selectList.length == 0) {
+          this.$message({
+            type: 'error',
+            message: '请选择车次信息',
+            duration: 2000
+          })
         } else {
-          this.history.getdataListParm.parammaps.date = ''
+          MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            console.log(this.selectList)
+            this.requestParam.common = {
+              'returnmap': '0'
+            }
+            this.requestParam.data = []
+            this.requestParam.data[0] = {
+              'name': 'insertSpotList',
+              'resultmaps': {
+                'list': this.selectList
+              }
+            }
+            this.requestParam.data[0].children = []
+            this.requestParam.data[0].children[0] = {
+              'name': 'deleteRemainplan',
+              'type': 'e',
+              'parammaps': {
+                id: '@insertSpotList.id',
+                pastureid: '@insertSpotList.pastureid'
+              }
+            }
+            ExecDataByConfig(this.requestParam).then(response => {
+              console.log('删除保存发送参数', this.requestParam)
+              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()
+              }
+            })
+          })
         }
-      })
-    },
-    changeDate() {
-      this.getHistoryList()
-    },
-    // 应用
-    handleApplication() {
-      console.log('点击了应用')
-      MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        this.requestParam.name = 'applyFPdate'
-        this.requestParam.parammaps = {}
-        this.requestParam.parammaps.pastureid = Cookies.get('pastureid')
-        this.requestParam.parammaps.date = this.history.getdataListParm.parammaps.date
-        PostDataByName(this.requestParam).then(response => {
-          if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+      },
+      // 校验
+      handleCheck() {
+        console.log('点击了校验')
+        this.check.dialogStatus = 'check'
+        this.check.dialogFormVisible = true
+        this.getCheckList()
+      },
+      getCheckList() {
+        GetDataByName(this.check.getCheckParm).then(response => {
+          if (response.data.list[0].bnames !== undefined) {
+            this.check.temp.isDistribution = 0
+            this.check.temp.bnames = response.data.list[0].bnames
           } else {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-            this.getHistoryIsDisplay()
-            this.getList()
+            this.check.temp = {}
+            this.check.temp.isDistribution = 1
           }
         })
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消应用' })
-      })
-    },
-    getHistoryList() {
-      this.history.listLoading = true
-      GetDataByName(this.history.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
+      },
+      // 历史记录
+      handleHistoryRecords() {
+        console.log('点击了历史记录')
+        this.dialogFull = false
+        this.history.dialogStatus = 'history'
+        this.history.dialogFormVisible = true
+        this.getDateList()
+      },
+      // 历史时间
+      getDateList() {
+        GetDataByName(this.history.getdataDateParm).then(response => {
           console.log('table数据', response.data.list)
-          this.history.list = response.data.list
-          this.history.pageNum = response.data.pageNum
-          this.history.pageSize = response.data.pageSize
-          this.history.total = response.data.total
-        } else {
-          this.history.list = []
-        }
-        setTimeout(() => {
-          this.history.listLoading = false
-        }, 100)
-      })
-    },
-    handleTakeEffect() {
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
-      } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          for (let i = 0; i < this.selectList.length; i++) {
-            // this.$set(this.selectList[i], 'enable', '1')
-            this.selectList[i].enable = 1
+          if (response.data.list !== null) {
+            this.history.getdataListParm.parammaps.date = response.data.list[0].maxdate
+            this.getHistoryList()
+          } else {
+            this.history.getdataListParm.parammaps.date = ''
           }
-          console.log('生效', this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanEnable', 'type': 'e', 'parammaps': {
-            enable: '@insertSpotList.enable',
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('生效保存发送参数', this.requestParam)
+        })
+      },
+      changeDate() {
+        this.getHistoryList()
+      },
+      // 应用
+      handleApplication() {
+        console.log('点击了应用')
+        MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
+          confirmButtonText: '确认',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.requestParam.name = 'applyFPdate'
+          this.requestParam.parammaps = {}
+          this.requestParam.parammaps.pastureid = Cookies.get('pastureid')
+          this.requestParam.parammaps.date = this.history.getdataListParm.parammaps.date
+          PostDataByName(this.requestParam).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({
+                title: '保存失败',
+                message: response.data,
+                type: 'warning',
+                duration: 2000
+              })
             } else {
-              this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({
+                title: '成功',
+                message: '保存成功',
+                type: 'success',
+                duration: 2000
+              })
+              this.getHistoryIsDisplay()
               this.getList()
             }
           })
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消应用'
+          })
         })
-      }
-    },
-    handleDisable() {
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
-      } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          for (let i = 0; i < this.selectList.length; i++) {
-            // this.$set(this.selectList[i], 'enable', '1')
-            this.selectList[i].enable = 0
+      },
+      getHistoryList() {
+        this.history.listLoading = true
+        GetDataByName(this.history.getdataListParm).then(response => {
+          console.log('table数据', response.data.list)
+          if (response.data.list !== null) {
+            console.log('table数据', response.data.list)
+            this.history.list = response.data.list
+            this.history.pageNum = response.data.pageNum
+            this.history.pageSize = response.data.pageSize
+            this.history.total = response.data.total
+          } else {
+            this.history.list = []
           }
-          console.log('禁用', this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'updateRemainplanEnable', 'type': 'e', 'parammaps': {
-            enable: '@insertSpotList.enable',
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('禁用保存发送参数', this.requestParam)
-            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()
+          setTimeout(() => {
+            this.history.listLoading = false
+          }, 100)
+        })
+      },
+      handleTakeEffect() {
+        if (this.selectList.length == 0) {
+          this.$message({
+            type: 'error',
+            message: '请选择车次信息',
+            duration: 2000
+          })
+        } else {
+          MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            for (let i = 0; i < this.selectList.length; i++) {
+              // this.$set(this.selectList[i], 'enable', '1')
+              this.selectList[i].enable = 1
             }
+            console.log('生效', this.selectList)
+            this.requestParam.common = {
+              'returnmap': '0'
+            }
+            this.requestParam.data = []
+            this.requestParam.data[0] = {
+              'name': 'insertSpotList',
+              'resultmaps': {
+                'list': this.selectList
+              }
+            }
+            this.requestParam.data[0].children = []
+            this.requestParam.data[0].children[0] = {
+              'name': 'updateRemainplanEnable',
+              'type': 'e',
+              'parammaps': {
+                enable: '@insertSpotList.enable',
+                id: '@insertSpotList.id',
+                pastureid: '@insertSpotList.pastureid'
+              }
+            }
+            ExecDataByConfig(this.requestParam).then(response => {
+              console.log('生效保存发送参数', this.requestParam)
+              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()
+              }
+            })
           })
-        })
+        }
+      },
+      handleDisable() {
+        if (this.selectList.length == 0) {
+          this.$message({
+            type: 'error',
+            message: '请选择车次信息',
+            duration: 2000
+          })
+        } else {
+          MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+            confirmButtonText: '确认',
+            cancelButtonText: '取消',
+            type: 'warning'
+          }).then(() => {
+            for (let i = 0; i < this.selectList.length; i++) {
+              // this.$set(this.selectList[i], 'enable', '1')
+              this.selectList[i].enable = 0
+            }
+            console.log('禁用', this.selectList)
+            this.requestParam.common = {
+              'returnmap': '0'
+            }
+            this.requestParam.data = []
+            this.requestParam.data[0] = {
+              'name': 'insertSpotList',
+              'resultmaps': {
+                'list': this.selectList
+              }
+            }
+            this.requestParam.data[0].children = []
+            this.requestParam.data[0].children[0] = {
+              'name': 'updateRemainplanEnable',
+              'type': 'e',
+              'parammaps': {
+                enable: '@insertSpotList.enable',
+                id: '@insertSpotList.id',
+                pastureid: '@insertSpotList.pastureid'
+              }
+            }
+            ExecDataByConfig(this.requestParam).then(response => {
+              console.log('禁用保存发送参数', this.requestParam)
+              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()
+              }
+            })
+          })
+        }
       }
-    }
 
+    }
   }
-}
-
 </script>
 
 <style lang="scss" scoped>
-  .search{clear: both;}
-  .table{margin-top:10px;}
+  .search {
+    clear: both;
+  }
+
+  .table {
+    margin-top: 10px;
+  }
 </style>

+ 34 - 34
src/views/inventoryManagement/feedContract/index.vue

@@ -10,18 +10,18 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增合同</el-button>
-      <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;">
-        <el-button class="export" icon="el-icon-upload2">导出</el-button>
-        <el-dropdown-menu slot="dropdown">
-          <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>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增合同</el-button>
+      <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;">
+        <el-button class="export" icon="el-icon-upload2">导出</el-button>
+        <el-dropdown-menu slot="dropdown">
+          <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>
     </div>
     <div class="table">
       <el-table
@@ -64,9 +64,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
             <span v-if="isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
           </template>
@@ -77,18 +77,18 @@
 
     <!-- 新增 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto">
           <el-row>
@@ -150,7 +150,7 @@
             </template>
           </el-table-column>
           <el-table-column v-if="create.dialogStatus !=='see'" label="操作" align="center" width="50" class-name="small-padding fixed-width" fixed="right">
-            <template slot-scope="{row}">
+            <template slot-scope="{row}">
               <el-button class="miniDanger" icon="el-icon-delete" @click="handleFeedDelete(row)" />
             </template>
           </el-table-column>
@@ -178,7 +178,7 @@ export default {
   name: 'FeedContract',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       isRoleEdit: [],
       requestParams: [
@@ -352,12 +352,12 @@ export default {
       this.table.getdataListParm.offset = 1
       this.getList()
     },
-    handleRefresh() {
+    handleRefresh() {
       this.table.getdataListParm.offset = 1
       this.table.getdataListParm.parammaps.inputDatetime = ''
       this.table.getdataListParm.parammaps.startTime = ''
       this.table.getdataListParm.parammaps.stopTime = ''
-      this.table.getdataListParm.parammaps.providerid = ''
+      this.table.getdataListParm.parammaps.providerid = ''
       this.getList()
     },
 
@@ -369,7 +369,7 @@ export default {
     },
     handleCreate() {
       console.log('点击了新增')
-      this.resetCreateTemp()
+      this.resetCreateTemp()
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -471,7 +471,7 @@ export default {
     },
     handleUpdate(row) {
       console.log('点击了编辑')
-      this.create.dialogStatus = 'update'
+      this.create.dialogStatus = 'update'
       this.dialogFull = false
       this.create.dialogFormVisible = true
       this.create.createTemp = Object.assign({}, row)
@@ -538,7 +538,7 @@ export default {
       })
     },
     handleSee(row) {
-      console.log('点击了查看')
+      console.log('点击了查看')
       this.dialogFull = false
       this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
@@ -698,7 +698,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>
 <style>
   .inputDatetime .el-range-separator{ padding: 0; margin: 0 10px; }

+ 31 - 31
src/views/inventoryManagement/inventoryList/index.vue

@@ -5,14 +5,14 @@
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
-    </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增盘点单</el-button>
-      <el-button class="success" icon="el-icon-upload2" @click="handleInventoryList">下载盘点单</el-button>
-      <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-button class="import" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport(1)">导出</el-button>
+    </div>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增盘点单</el-button>
+      <el-button class="success" icon="el-icon-upload2" @click="handleInventoryList">下载盘点单</el-button>
+      <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-button class="import" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport(1)">导出</el-button>
     </div>
 
     <div class="table">
@@ -67,7 +67,7 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
             <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
-            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(scope.row)" />
           </template>
         </el-table-column>
@@ -77,18 +77,18 @@
 
     <!-- 新增盘点单 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto">
           <el-row>
@@ -169,7 +169,7 @@ export default {
   name: 'InventoryList',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       table: {
         getdataListParm: {
@@ -261,7 +261,7 @@ export default {
         },
         list: []
       },
-      isokDisable: false,
+      isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' }
@@ -299,11 +299,11 @@ export default {
     this.getList()
   },
 
-  methods: {
-    getButtons() {
-      const Edit = 'InventoryList'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
+  methods: {
+    getButtons() {
+      const Edit = 'InventoryList'
+      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      this.isRoleEdit = isRoleEdit
     },
     handleBefore() {
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
@@ -363,7 +363,7 @@ export default {
     },
     handleCreate() {
       console.log('点击了新增盘点单')
-      this.resetCreateTemp()
+      this.resetCreateTemp()
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -465,7 +465,7 @@ export default {
     },
 
     handleSee(row) {
-      console.log('点击了查看')
+      console.log('点击了查看')
       this.dialogFull = false
       this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
@@ -650,7 +650,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>
 <style>
   .inputDatetime .el-range-separator{ padding: 0; margin: 0 10px; }

+ 47 - 47
src/views/inventoryManagement/inventoryList/index改.vue

@@ -5,14 +5,14 @@
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
-    </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增盘点单</el-button>
-      <el-button class="success" icon="el-icon-upload2" @click="handleInventoryList">下载盘点单</el-button>
-      <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-button class="import" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport(1)">导出</el-button>
+    </div>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增盘点单</el-button>
+      <el-button class="success" icon="el-icon-upload2" @click="handleInventoryList">下载盘点单</el-button>
+      <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-button class="import" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport(1)">导出</el-button>
     </div>
 
     <div class="table">
@@ -66,10 +66,10 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
-            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
-            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
+            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
+            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(scope.row)" />
-            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(scope.row)" />
           </template>
         </el-table-column>
@@ -79,18 +79,18 @@
 
     <!-- 新增盘点单 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 90%;margin:0 auto">
           <el-row>
@@ -170,7 +170,7 @@ export default {
   name: 'InventoryList',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       table: {
         getdataListParm: {
@@ -193,7 +193,7 @@ export default {
       },
       textMap: {
         create: '新增',
-        see: '查看盘点单',
+        see: '查看盘点单',
         update:'编辑'
       },
       create: {
@@ -263,7 +263,7 @@ export default {
         },
         list: []
       },
-      isokDisable: false,
+      isokDisable: false,
       isRoleEdit: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' }
@@ -301,11 +301,11 @@ export default {
     this.getList()
   },
 
-  methods: {
-    getButtons() {
-      const Edit = 'InventoryList'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
+  methods: {
+    getButtons() {
+      const Edit = 'InventoryList'
+      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
+      this.isRoleEdit = isRoleEdit
     },
     handleBefore() {
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
@@ -365,7 +365,7 @@ export default {
     },
     handleCreate() {
       console.log('点击了新增盘点单')
-      this.resetCreateTemp()
+      this.resetCreateTemp()
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -467,7 +467,7 @@ export default {
     },
 
     handleSee(row) {
-      console.log('点击了查看')
+      console.log('点击了查看')
       this.dialogFull = false
       this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
@@ -512,19 +512,19 @@ export default {
       }).catch(() => {
         this.$message({ type: 'info', message: '已取消删除' })
       })
-    },
-    handleUpdate(row){
-      console.log('点击了编辑')
-      this.dialogFull = false
-      this.create.dialogStatus = 'update'
-      this.create.dialogFormVisible = true
-      this.create.createTemp = Object.assign({}, row)
-      this.see.getdataListParm.parammaps.pastureid = row.pastureid
-      this.see.getdataListParm.parammaps.id = row.id
-      this.getSeeList()
-    },
-    updateData(){
-      console.log('点击了编辑保存')
+    },
+    handleUpdate(row){
+      console.log('点击了编辑')
+      this.dialogFull = false
+      this.create.dialogStatus = 'update'
+      this.create.dialogFormVisible = true
+      this.create.createTemp = Object.assign({}, row)
+      this.see.getdataListParm.parammaps.pastureid = row.pastureid
+      this.see.getdataListParm.parammaps.id = row.id
+      this.getSeeList()
+    },
+    updateData(){
+      console.log('点击了编辑保存')
     },
     handleInventoryList() {
       this.download.getdataListParm.name = 'getFeedstorageWeightList'
@@ -664,7 +664,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>
 <style>
   .inputDatetime .el-range-separator{ padding: 0; margin: 0 10px; }

+ 1 - 1
src/views/inventoryManagement/laborConsumption/index.vue

@@ -655,7 +655,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>
  <style lang="scss">
    .typeSelect span .el-popover__reference .el-input--suffix {

+ 13 - 13
src/views/inventoryManagement/laborConsumption/index改.vue

@@ -87,8 +87,8 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button  v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <el-button  v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(row)" />
           </template>
         </el-table-column>
@@ -172,7 +172,7 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
           <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
@@ -188,7 +188,7 @@ import Pagination from '@/components/Pagination'
 import Cookies from 'js-cookie'
 import { parseTime, json2excel } from '@/utils/index.js'
 import axios from 'axios'
-import { getToken } from '@/utils/auth'
+import { getToken } from '@/utils/auth'
 import { MessageBox } from 'element-ui'
 export default {
   name: 'LaborConsumption',
@@ -545,16 +545,16 @@ export default {
         row.cowclass = ''
       }
       this.create.createTemp = Object.assign({}, row)
-    },
-    updateData(){
-      console.log('点击了编辑保存')
+    },
+    updateData(){
+      console.log('点击了编辑保存')
     },
     handleRowDelete(row) {
-      console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-
+      console.log('点击了行内删除')
+      MessageBox.confirm('是否确认删除此信息?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+
       }).catch(() => {
         this.$message({ type: 'info', message: '已取消删除' })
       })
@@ -667,7 +667,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>
  <style lang="scss">
    .typeSelect span .el-popover__reference .el-input--suffix {

+ 16 - 16
src/views/inventoryManagement/statistics/index.vue

@@ -58,18 +58,18 @@
     </div>
 
     <el-dialog :fullscreen="dialogFull" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[see.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[see.dialogStatus] }}
+          </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-see">
         <el-tabs v-model="see.activeName" @tab-click="handleTabClick">
           <el-tab-pane label="入库记录" name="first">
@@ -195,7 +195,7 @@ export default {
   name: 'Statistics',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       isRoleEdit: [],
       requestParams: [
@@ -333,11 +333,11 @@ export default {
     handleRefresh() {
       console.log('点击了重置')
       this.table.getdataListParm.offset = 1
-      this.table.getdataListParm.parammaps.feedid = ''
+      this.table.getdataListParm.parammaps.feedid = ''
       this.getList()
     },
     handleSee(row) {
-      this.see.dialogStatus = 'see'
+      this.see.dialogStatus = 'see'
       this.dialogFull = false
       this.see.dialogFormVisible = true
       this.see.list = []
@@ -442,5 +442,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 19 - 19
src/views/inventoryManagement/systemConsumption/index.vue

@@ -10,9 +10,9 @@
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
-      </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否预混料" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in isPremixList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否预混料" class="filter-item" style="width: 150px;" clearable>
+        <el-option v-for="item in isPremixList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否审核" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in isAuditList" :key="item.id" :label="item.name" :value="item.id" />
@@ -59,12 +59,12 @@
           <template slot-scope="scope">
             <span>{{ scope.row.feedname }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="是否预混料" min-width="60px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.premix == 0">否</span>
-            <span v-else>是</span>
-          </template>
+        </el-table-column>
+        <el-table-column label="是否预混料" min-width="60px" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.premix == 0">否</span>
+            <span v-else>是</span>
+          </template>
         </el-table-column>
         <el-table-column label="库存重量(kg)" min-width="100px" align="center">
           <template slot-scope="scope">
@@ -265,7 +265,7 @@ export default {
       this.table.getdataListParm.parammaps.feedid = ''
       this.table.getdataListParm.parammaps.cowclassid = ''
       this.table.getdataListParm.parammaps.ischarge = ''
-      this.table.getdataListParm.offset = 1
+      this.table.getdataListParm.offset = 1
       this.getList()
     },
     handleUpdate(row) {
@@ -313,13 +313,13 @@ export default {
       row.isUpdate = true
       row.isUpdateSave = false
       this.getList()
-    },
-    handleRevoke(row){
-      MessageBox.confirm('请确认是否要撤销审核结果?', '提示', {
-        confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
-      }).then(() => {
-        console.log('点击了撤销')
-      })
+    },
+    handleRevoke(row){
+      MessageBox.confirm('请确认是否要撤销审核结果?', '提示', {
+        confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
+      }).then(() => {
+        console.log('点击了撤销')
+      })
     },
     handleSelectionChange(val) {
       console.log('勾选数据', val)
@@ -408,7 +408,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .operation{margin-top:10px;}
+  // .operation{margin-top:10px;}
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 2 - 2
src/views/inventoryManagement/systemConsumption/index备.vue

@@ -396,7 +396,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .operation{margin-top:10px;}
+  // .operation{margin-top:10px;}
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 31 - 31
src/views/inventoryManagement/warehousing/index.vue

@@ -110,18 +110,18 @@
 
     <!-- 新增入库单 -->
     <el-dialog :fullscreen="dialogFull" :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 100%;margin:0 auto">
           <el-row>
@@ -167,7 +167,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="供应商:" prop="providerid">
+              <el-form-item label="供应商:" prop="providerid">
                 <el-input v-if="create.dialogStatus=='see'" ref="providername" v-model.trim="create.createTemp.providername" disabled class="filter-item" placeholder="请选择供应商" />
                 <el-select v-else v-model="create.createTemp.providerid" clearable placeholder="请选择供应商" :disabled="create.dialogStatus=='see'" class="filter-item" style="width: 100%" @change="changeSupplier">
                   <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
@@ -261,18 +261,18 @@
 
     <!-- 初始化库存 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="initial.dialogFormVisible" :close-on-click-modal="false" width="80%" height="55%">
-      <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" />
-            {{ textMap[initial.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[initial.dialogStatus] }}
+          </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" style="height: 100%;margin: 0 auto 60px;">
         <div class="operation">
           <el-button style="float: left;margin-bottom:10px;" class="success" @click="handleInitialExport">模板下载</el-button>
@@ -331,7 +331,7 @@ export default {
   name: 'Warehousing',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       feedNameList: [], // 饲料名称
       feedNameAddList: [], // 饲料名称新增
@@ -742,7 +742,7 @@ export default {
       }
     },
     handleCreate() {
-      console.log('点击了新增入库单')
+      console.log('点击了新增入库单')
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -880,7 +880,7 @@ export default {
       console.log('点击了编辑')
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
-      })
+      })
       this.dialogFull = false
       this.create.dialogStatus = 'update'
       this.create.dialogFormVisible = true
@@ -1020,7 +1020,7 @@ export default {
       console.log('点击了查看')
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
-      })
+      })
       this.dialogFull = false
       this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
@@ -1032,7 +1032,7 @@ export default {
     },
 
     handleInitial() {
-      console.log('点击了初始化库存')
+      console.log('点击了初始化库存')
       this.dialogFull = false
       this.initial.dialogStatus = 'initial'
       this.initial.dialogFormVisible = true
@@ -1267,5 +1267,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 34 - 34
src/views/inventoryManagement/warehousing/index改.vue

@@ -111,18 +111,18 @@
 
     <!-- 新增入库单 -->
     <el-dialog :fullscreen="dialogFull" :title="textMap[create.dialogStatus]" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 100%;margin:0 auto">
           <el-row>
@@ -168,7 +168,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="供应商:" prop="providerid">
+              <el-form-item label="供应商:" prop="providerid">
                 <el-input v-if="create.dialogStatus=='see'" ref="providername" v-model.trim="create.createTemp.providername" disabled class="filter-item" placeholder="请选择供应商" />
                 <el-select v-else v-model="create.createTemp.providerid" clearable placeholder="请选择供应商" :disabled="create.dialogStatus=='see'" class="filter-item" style="width: 100%" @change="changeSupplier">
                   <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
@@ -262,18 +262,18 @@
 
     <!-- 初始化库存 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="initial.dialogFormVisible" :close-on-click-modal="false" width="80%" height="55%">
-      <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" />
-            {{ textMap[initial.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[initial.dialogStatus] }}
+          </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" style="height: 100%;margin: 0 auto 60px;">
         <div class="operation">
           <el-button style="float: left;margin-bottom:10px;" class="success" @click="handleInitialExport">模板下载</el-button>
@@ -332,7 +332,7 @@ export default {
   name: 'Warehousing',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       feedNameList: [], // 饲料名称
       feedNameAddList: [], // 饲料名称新增
@@ -743,7 +743,7 @@ export default {
       }
     },
     handleCreate() {
-      console.log('点击了新增入库单')
+      console.log('点击了新增入库单')
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -881,7 +881,7 @@ export default {
       console.log('点击了编辑')
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
-      })
+      })
       this.dialogFull = false
       this.create.dialogStatus = 'update'
       this.create.dialogFormVisible = true
@@ -1016,15 +1016,15 @@ export default {
           })
         }
       })
-    },
-    handleRevoke(row){
-      console.log('点击了撤销')
+    },
+    handleRevoke(row){
+      console.log('点击了撤销')
     },
     handleSee(row) {
       console.log('点击了查看')
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
-      })
+      })
       this.dialogFull = false
       this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
@@ -1036,7 +1036,7 @@ export default {
     },
 
     handleInitial() {
-      console.log('点击了初始化库存')
+      console.log('点击了初始化库存')
       this.dialogFull = false
       this.initial.dialogStatus = 'initial'
       this.initial.dialogFormVisible = true
@@ -1271,5 +1271,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
 </style>

+ 1 - 1
src/views/shedProduction/dungScores/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item " type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>

+ 6 - 8
src/views/shedProduction/dungScores/index.vue

@@ -11,9 +11,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -40,6 +40,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -370,7 +371,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -953,7 +955,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 24 - 24
src/views/shedProduction/dutyRecord/index.vue

@@ -16,8 +16,8 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;margin-right:10px;" @click="handleCreate">分配</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus"  @click="handleCreate">分配</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
       <el-button class="export" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport">导出</el-button>
     </div>
     <div class="table">
@@ -34,6 +34,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -82,18 +83,18 @@
 
     <!-- 新增/编辑 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="90%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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-tabs v-model="create.activeName" @tab-click="handleClick">
           <el-tab-pane label="TMR设备" name="first">
@@ -215,7 +216,7 @@ export default {
   name: 'DutyRecord',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       isRoleEdit: [],
       requestParams: [
@@ -314,7 +315,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
 
@@ -410,7 +412,7 @@ export default {
     // 新增
     handleCreate() {
       console.log('点击了分配')
-      this.create.dialogStatus = 'create'
+      this.create.dialogStatus = 'create'
       this.dialogFull = false
       this.create.dialogFormVisible = true
       this.getDialogList()
@@ -534,11 +536,11 @@ export default {
           i = 0
         }
       }
-      for(let i=0;i<this.create.list.length;i++){
-        if(this.create.list[i].operatetime == '' || this.create.list[i].operatetime == undefined){
-          this.$message({ type: 'error', message: '生效日期不可为空', duration: 2000 })
-          return
-        }
+      for(let i=0;i<this.create.list.length;i++){
+        if(this.create.list[i].operatetime == '' || this.create.list[i].operatetime == undefined){
+          this.$message({ type: 'error', message: '生效日期不可为空', duration: 2000 })
+          return
+        }
       }
       console.log('点击了新增保存11', this.create.list)
       this.requestParam.common = { 'returnmap': '0' }
@@ -711,7 +713,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
   /deep/ .operatetime {margin-right: 0;}
 </style>

+ 1 - 1
src/views/shedProduction/fecalScreen/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" :clearable="true" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" :clearable="true" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>

+ 9 - 11
src/views/shedProduction/fecalScreen/index.vue

@@ -12,9 +12,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -41,6 +41,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -341,7 +342,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -760,7 +762,7 @@ export default {
         MessageBox.confirm('是否确认复制此信息?', {
           confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         }).then(() => {
-     
+
           var send_data = {
             "common":{"returnmap":"0"},
             "data":[
@@ -782,7 +784,7 @@ export default {
             ]
           }
           ExecDataByConfig(send_data).then(response => {
-            if (response.msg === 'fail') {     
+            if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -792,7 +794,7 @@ export default {
         }).catch(() => {
           this.$message({ type: 'info', message: '已取消复制' })
         })
-      } 
+      }
     },
     // 导出
     handleExport(item) {
@@ -910,7 +912,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 1 - 1
src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.changeTime" :clearable="true" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" @change="changeTime" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.changeTime" :clearable="true" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" @change="changeTime" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>

+ 10 - 12
src/views/shedProduction/formulaDryMatter/index.vue

@@ -14,9 +14,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -43,6 +43,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -325,7 +326,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -530,7 +532,7 @@ export default {
           }
           this.requestParam.name = 'insertFtdry'
           this.requestParam.parammaps = this.create.temp
-          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
+          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
           var url = 'authdata/ftdry/add'
           postJson(url,this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
@@ -590,8 +592,8 @@ export default {
           }
           this.requestParam.name = 'insertFtdry'
           this.requestParam.parammaps = this.create.temp
-          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
-          var url = 'authdata/ftdry/add'
+          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
+          var url = 'authdata/ftdry/add'
           postJson(url,this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
@@ -650,7 +652,7 @@ export default {
           this.requestParam.name = 'updateFtdry'
           this.requestParam.parammaps = this.create.temp
           if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
-          var url = 'authdata/ftdry/add'
+          var url = 'authdata/ftdry/add'
           postJson(url,this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
             if (response.msg !== 'fail') {
@@ -918,7 +920,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 23 - 25
src/views/shedProduction/materialRemainingRecord/index.vue

@@ -11,9 +11,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -39,6 +39,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -74,7 +75,7 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button v-if="isRoleEdit" :disabled="row.emp == '设备采集'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" :disabled="row.emp == '设备采集'" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
           </template>
         </el-table-column>
@@ -84,18 +85,18 @@
 
     <!-- 新增/编辑 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" width="40%">
-      <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" />
-            {{ textMap[create.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[create.dialogStatus] }}
+          </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="create.rules" :model="create.temp" label-position="right" label-width="135px" style="width: 90%;margin:0 auto 50px">
           <el-row v-if="create.dialogStatus=='create'">
@@ -169,7 +170,7 @@ export default {
   name: 'MaterialRemainingRecord',
   components: { Pagination },
   data() {
-    return {
+    return {
       dialogFull: false,
       isRoleEdit: [],
       requestParams: [
@@ -249,7 +250,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -392,7 +394,7 @@ export default {
       })
     },
     handleCreate() {
-      console.log('点击了新增')
+      console.log('点击了新增')
       this.dialogFull = false
       this.resetTemp()
       this.getNoteTakerList()
@@ -483,7 +485,7 @@ export default {
 
     // 编辑
     handleUpdate(row) {
-      console.log('点击了编辑', row)
+      console.log('点击了编辑', row)
       this.dialogFull = false
       row.barid = String(row.barid)
       this.create.temp = Object.assign({}, row)
@@ -602,7 +604,7 @@ export default {
               const barid = new RegExp("key 'barid'")
               if (barid.test(response.data)) {
                 this.$notify({ type: 'warning', message: '该栏舍该班次今日剩料量已存在,不可重复生成', duration: 2000 })
-                return
+                return
               }
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
@@ -721,7 +723,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 1 - 1
src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="true"  placeholder="年/月/日" />
+      <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="true"  placeholder="年/月/日" />
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>

+ 9 - 11
src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -14,9 +14,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -43,6 +43,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="40" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -372,7 +373,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -804,7 +806,7 @@ export default {
         MessageBox.confirm('是否确认复制此信息?', {
           confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
         }).then(() => {
-     
+
           var send_data = {
             "common":{"returnmap":"0"},
             "data":[
@@ -826,7 +828,7 @@ export default {
             ]
           }
           ExecDataByConfig(send_data).then(response => {
-            if (response.msg === 'fail') {     
+            if (response.msg === 'fail') {
               this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
@@ -836,7 +838,7 @@ export default {
         }).catch(() => {
           this.$message({ type: 'info', message: '已取消复制' })
         })
-      } 
+      }
     },
 
     // 导出
@@ -955,7 +957,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 11 - 17
src/views/shedProduction/performance/index.vue

@@ -14,9 +14,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -42,6 +42,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -189,16 +190,12 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="牲畜类别:" prop="cowclassid">
-                <el-select v-if="create.dialogStatus=='create'" v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width: 100%;" @change="changeCowclass">
+                <!-- <el-select v-if="create.dialogStatus=='create'" v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width: 100%;" @change="changeCowclass">
                   <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.id" />
-                </el-select>
-
-
-<!-- 注释内容后续版本更 -->
-              <!-- <el-select v-if="create.dialogStatus=='create'"  v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width:95%;padding:10px 0;" @change="changeParent">
+                </el-select> -->
+              <el-select v-if="create.dialogStatus=='create'"  v-model="create.temp.cowclassid" filterable placeholder="牲畜类别" class="filter-item" style="width:95%;padding:10px 0;" @change="changeParent">
                 <el-option v-for="item in parentList" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select> -->
-<!-- 注释内容后续版本更 -->
+              </el-select>
                 <!-- <el-input v-else ref="cowclass" v-model="create.temp.cowclass" disabled class="filter-item" placeholder="牲畜类别" /> -->
               </el-form-item>
             </el-col>
@@ -384,7 +381,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -516,7 +514,7 @@ export default {
 
     changeParent(val) {
       console.log('点击了牲畜类别父类', val)
-  
+
 
       this.create.temp.cowclass = this.parentList.find(obj => obj.id === item).label
       this.create.temp.bigcowclass = this.parentList.find(obj => obj.id === item).label
@@ -1180,7 +1178,3 @@ export default {
 }
 
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 1 - 1
src/views/shedProduction/physicalConditionScore/historyRecord.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-table">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日"  :clearable="true"/>
+      <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日"  :clearable="true"/>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>

+ 6 - 8
src/views/shedProduction/physicalConditionScore/index.vue

@@ -11,9 +11,9 @@
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
     <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" style="float: left;margin-right:10px;" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" style="float: left;margin-right:10px;" @click="handleDelete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" style="float: left;margin-right:10px;" @click="handleCopy">复制</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="handleDelete">删除</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -40,6 +40,7 @@
         :cell-style="cellStyle"
         class="elTable table-fixed"
         @selection-change="handleSelectionChange"
+        :max-height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
@@ -394,7 +395,8 @@ export default {
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45
     }
   },
   computed: {
@@ -980,7 +982,3 @@ export default {
   }
 }
 </script>
-<style lang="scss" scoped>
-  .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
-</style>

+ 2 - 2
src/views/statisticalAnalysis/equipmentRunningTrack/index.vue

@@ -421,7 +421,7 @@ export default {
             { 'longitude': 117.8813614, 'latitude': 33.8237577 },
             { 'longitude': 117.8816353, 'latitude': 33.8237002 },
             { 'longitude': 117.8820108, 'latitude': 33.8236552 },
-            { 'longitude': 117.8821708, 'latitude': 33.8237152 },
+            { 'longitude': 117.8821708, 'latitude': 33.8237152 },
             { 'longitude': 117.8822708, 'latitude': 33.8236152 },
             { 'longitude': 117.8824708, 'latitude': 33.8236152 },
             { 'longitude': 117.8825531, 'latitude': 33.8235588 },
@@ -545,7 +545,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
+  
   .detail{
     height:84px;border: 1px solid #EBEEF5;padding-left:10px;font:16px/32px '';color:#333;
     .detail-t{margin-top: 10px;}

+ 78 - 27
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -72,7 +72,7 @@
             <el-table-column :key="28" sortable label="标准差" min-width="60px" align="center" prop="方差" />
             <el-table-column :key="29" align="center" width="70" label="操作" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
-                <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+                <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('1',row)" />
               </template>
             </el-table-column>
           </el-table>
@@ -123,7 +123,7 @@
             <el-table-column :key="28" sortable label="标准差" min-width="60px" align="center" prop="方差" />
             <el-table-column :key="29" align="center" width="70" label="操作" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
-                <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+                <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('2',row)" />
               </template>
             </el-table-column>
           </el-table>
@@ -135,7 +135,7 @@
               <span>图表查询时间:</span>
               <el-radio-group v-model="tab.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeAllSpecificDate">
                 <el-radio-button label="1" border>日</el-radio-button>
-                <el-radio-button label="2" border>周</el-radio-button>
+                <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                 <el-radio-button label="3" border>月</el-radio-button>
               </el-radio-group>
               <div v-show="tab.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -165,7 +165,7 @@
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart2.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart2')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -231,7 +231,7 @@
                     <my-select ref="tenantselect" :model="tab.chart1.getdataListParm.parammaps.statisticsList" :option="tab.chart1.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart1" />
                     <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart1')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -295,7 +295,7 @@
                     <my-select ref="tenantselect" :model="tab.chart3.getdataListParm.parammaps.statisticsList" :option="tab.chart3.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart3" />
                     <el-radio-group v-model="tab.chart3.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart3')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -357,7 +357,7 @@
                     <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart4" />
                     <el-radio-group v-model="tab.chart4.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart4')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -421,7 +421,7 @@
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart5.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart5')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -486,7 +486,7 @@
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart6.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart6')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -548,7 +548,7 @@
                     <my-select ref="tenantselect" :model="tab.chart7.getdataListParm.parammaps.statisticsLis" :option="tab.chart7.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart7" />
                     <el-radio-group v-model="tab.chart7.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart7')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -620,9 +620,9 @@
           <el-select v-model="tab2.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 130px;" filterable placeholder="跳转方式" class="filter-item" clearable>
             <el-option v-for="item in tab2.jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-select v-model="tab2.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
+          <!-- <el-select v-model="tab2.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
             <el-option v-for="item in tab2.isuseList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
+          </el-select> -->
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch2">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">重置</el-button>
           <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button>
@@ -684,9 +684,9 @@
           <el-select v-model="tab3.table.getdataListParm.parammaps.buttontype" style="margin-top: 5px;width: 110px;" filterable placeholder="跳转方式" class="filter-item" clearable>
             <el-option v-for="item in tab3.jumpModeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-select v-model="tab3.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
+          <!-- <el-select v-model="tab3.table.getdataListParm.parammaps.isuse" style="margin-top: 5px;width: 130px;" filterable placeholder="上传状态" class="filter-item" clearable>
             <el-option v-for="item in tab3.isuseList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
+          </el-select> -->
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleSearch3">查询</el-button>
           <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh3">重置</el-button>
           <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport3">导出</el-button>
@@ -741,7 +741,7 @@
     </div>
     </el-dialog>
     <!-- 查看 -->
-    <See :show.sync="isShowDialog" :row-pid="rowPid" :title-fname="titlefname" />
+    <See :show.sync="isShowDialog" :row-pid="rowPid" :start-time="startTime" :stop-time="stopTime"  :optdevice="optdevice" :title-fname="titlefname" :method-name="methodName" />
   </div>
 </template>
 
@@ -1252,7 +1252,11 @@ export default {
         isuseList: [{ id: '0', name: '未完成' }, { id: '2', name: '部分完成' }, { id: '1', name: '全部完成' }]
       },
       titlefname: '',
+      methodName:'',
       rowPid: '',
+      optdevice:'',
+      startTime:'',
+      stopTime:'',
       isShowDialog: false,
       statisticalTypeList: [{ id: '0', name: '驾驶员' }, { id: '1', name: '配方名称' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '牲畜类别' }, { id: '4', name: '车次' }, { id: '5', name: 'TMR名称' }],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
@@ -3887,20 +3891,67 @@ export default {
         this.exportList.dialogFormVisible = false
       })
     },
-    handleSee(row) {
-      if (this.tab.radio == 1) {
-        this.titlefname = '准确性详情——配方名称:' + row.配方名称
-      } else if (this.tab.radio == 2) {
-        this.titlefname = '准确性详情——栏舍名称:' + row.栏舍名称
-      } else if (this.tab.radio == 3) {
-        this.titlefname = '准确性详情——牲畜类别:' + row.栏舍名称
-      } else if (this.tab.radio == 4) {
-        this.titlefname = '准确性详情——车次:' + row.车次
-      } else if (this.tab.radio == 5) {
-        this.titlefname = '准确性详情——TMR名称:' + row.TMR名称
+    handleSee(item,row) {
+      if(item == 1){
+        // 混料
+        if (this.tab.radio == 0) {
+          this.methodName = 'getDownloadedplanByJsyHL'
+          this.optdevice = row.驾驶员
+          this.titlefname = '准确性详情——驾驶员:' + row.驾驶员
+        }else if (this.tab.radio == 1) {
+          this.methodName = 'getDownloadedplanByTemHL'
+          this.optdevice = row.配方名称
+          this.titlefname = '准确性详情——配方名称:' + row.配方名称
+        } else if (this.tab.radio == 2) {
+          this.methodname = 'getDownloadedplanByBarHL'
+          this.optdevice = row.栏舍名称
+          this.titlefname = '准确性详情——栏舍名称:' + row.栏舍名称
+        } else if (this.tab.radio == 3) {
+          this.methodName = 'getDownloadedplanBySCHL'
+          this.optdevice = row.牲畜类别
+          this.titlefname = '准确性详情——牲畜类别:' + row.牲畜类别
+        } else if (this.tab.radio == 4) {
+          this.methodName = 'getDownloadedplanByTrainsHL'
+          this.optdevice = row.车次
+          this.titlefname = '准确性详情——车次:' + row.车次
+        } else if (this.tab.radio == 5) {
+          this.methodName = 'getDownloadedplanByTmrHL'
+          this.optdevice = row.TMR名称
+          this.titlefname = '准确性详情——TMR名称:' + row.TMR名称
+        }
+      }else{
+        // 撒料
+        if (this.tab.radio == 0) {
+          this.methodName = 'getDownloadedplanByJsySL'
+          this.optdevice = row.驾驶员
+          this.titlefname = '准确性详情——驾驶员:' + row.驾驶员
+        }else if (this.tab.radio == 1) {
+          this.methodName = 'getDownloadedplanByTemSL'
+          this.optdevice = row.配方名称
+          this.titlefname = '准确性详情——配方名称:' + row.配方名称
+        } else if (this.tab.radio == 2) {
+          this.methodName = 'getDownloadedplanByBarSL'
+          this.optdevice = row.栏舍名称
+          this.titlefname = '准确性详情——栏舍名称:' + row.栏舍名称
+        } else if (this.tab.radio == 3) {
+          this.methodName = 'getDownloadedplanBySCSL'
+          this.optdevice = row.牲畜类别
+          this.titlefname = '准确性详情——牲畜类别:' + row.牲畜类别
+        } else if (this.tab.radio == 4) {
+          this.methodName = 'getDownloadedplanByTrainsSL'
+          this.optdevice = row.车次
+          this.titlefname = '准确性详情——车次:' + row.车次
+        } else if (this.tab.radio == 5) {
+          this.methodName = 'getDownloadedplanByTmrSL'
+          this.optdevice = row.TMR名称
+          this.titlefname = '准确性详情——TMR名称:' + row.TMR名称
+        }
       }
+
       console.log(row, 'row')
-      this.rowPid = row.pid
+      // this.rowPid = row.pid
+      this.startTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.stopTime = parseTime(this.tab.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
       this.isShowDialog = true
     },
     getTMRNameList(){

+ 51 - 4
src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -123,13 +123,18 @@
 <script>
 import echarts from 'echarts'
 require('echarts/theme/macarons')
+import Cookies from 'js-cookie'
 import { GetDataByName, GetReportform, formatNum } from '@/api/common'
 export default {
   name: 'See',
   props: {
     show: { type: Boolean, default: false }, // 弹框可见标志
     titleFname: { type: String, defalut: '准确性详情' },
-    rowPid: { type: String, defalut: '0' }
+    methodName:{ type: String, defalut: '' },
+    rowPid: { type: String, defalut: '0' },
+    optdevice: { type: String, defalut: '' },
+    startTime:{ type: String, defalut: '' },
+    stopTime:{ type: String, defalut: '' }
   },
   data() {
     return {
@@ -137,10 +142,14 @@ export default {
       visible: this.show,
       title: '',
       pid: '',
+      methodname:'',
+      optdevice:'',
+      startTime:'',
+      stopTime:'',
       table1: {
         getdataListParm: {
-          name: 'getDownloadedplanHLCK', page: 1, offset: 1, pagecount: '', returntype: 'Map',
-          parammaps: { pid: '' }
+          name: '', page: 1, offset: 1, pagecount: '', returntype: 'Map',
+          parammaps: { pid: '', optdevice:'', startTime:'', stopTime:'',pastureid: '' }
         },
         tableKey: 0, list: [], total: 0, listLoading: false
       },
@@ -200,6 +209,34 @@ export default {
         console.log(newVal, 'rowPid')
         this.pid = newVal
       }
+    },
+    methodName: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log(newVal, 'methodname')
+        this.methodname = newVal
+      }
+    },
+    optdevice: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log(newVal, 'optdevice')
+        this.optdevice = newVal
+      }
+    },
+    startTime: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log(newVal, 'startTime')
+        this.startTime = newVal
+      }
+    },
+    stopTime: {
+      immediate: true,
+      handler(newVal, oldVal) {
+        console.log(newVal, 'stopTime')
+        this.stopTime = newVal
+      }
     }
   },
   created() {
@@ -216,7 +253,12 @@ export default {
     // TMR设备列表
     getList1() {
       this.table1.listLoading = true
+      this.table1.getdataListParm.name = this.methodname
+      this.table1.getdataListParm.parammaps.optdevice = this.optdevice
+      this.table1.getdataListParm.parammaps.startTime = this.startTime
+      this.table1.getdataListParm.parammaps.stopTime = this.stopTime
       this.table1.getdataListParm.parammaps.pid = this.pid
+      this.table1.getdataListParm.parammaps.pastureid = Cookies.get('pastureid')
       GetDataByName(this.table1.getdataListParm).then(response => {
         console.log('车次信息数据', response.data.list)
         if (response.data !== null && response.data.list !== null) {
@@ -395,7 +437,12 @@ export default {
       }
     },
     rowClick(row, column, event) {
-
+      this.table2.getdataListParm.parammaps.pid = row.pid
+      this.table3.getdataListParm.parammaps.pid = row.pid
+      this.chart1.getdataListParm.parammaps.pid = row.pid
+      this.getList2()
+      this.getList3()
+      this.getChart1()
     },
     rowStyle({ row, rowIndex }) {
         let stylejson = {};

+ 6 - 7
src/views/statisticalAnalysis/feedingEfficiency/pasture/index.vue

@@ -63,7 +63,7 @@
               <span>图表查询时间:</span>
               <el-radio-group v-model="tab.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeAllSpecificDate">
                 <el-radio-button label="1" border>日</el-radio-button>
-                <el-radio-button label="2" border>周</el-radio-button>
+                <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                 <el-radio-button label="3" border>月</el-radio-button>
               </el-radio-group>
               <div v-show="tab.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -92,7 +92,7 @@
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart1.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart1')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -151,7 +151,7 @@
                     <my-select ref="tenantselect" :model="tab.chart2.getdataListParm.parammaps.statisticsList" :option="tab.chart2.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart2" />
                     <el-radio-group v-model="tab.chart2.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart2')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -213,7 +213,7 @@
                   <div class="chartButton">
                     <el-radio-group v-model="tab.chart3.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart3')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -271,7 +271,7 @@
                     <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart4" />
                     <el-radio-group v-model="tab.chart4.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart4')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
@@ -323,7 +323,6 @@
               </div>
             </el-col>
           </el-row>
-
           <el-row :gutter="10" class="dashboard-editor-container" style="margin-bottom: 30px;">
             <el-col :span="24">
               <div class="grid-content">
@@ -333,7 +332,7 @@
                     <my-select ref="tenantselect" :model="tab.chart5.getdataListParm.parammaps.statisticsList" :option="tab.chart5.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart5" />
                     <el-radio-group v-model="tab.chart5.getdataListParm.parammaps.specificDate" class="specificDate" size="mini" style="display: inline-block;" @change="changeChartSpecificDate('chart5')">
                       <el-radio-button label="1" border>日</el-radio-button>
-                      <el-radio-button label="2" border>周</el-radio-button>
+                      <!-- <el-radio-button label="2" border>周</el-radio-button> -->
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">

+ 1 - 1
src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -1203,7 +1203,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
+  
   .detail{
     height:84px;padding:0 10px;font:16px/32px '';color:#333;background: #F9F9F9;display: flex; align-items: center;text-align: center;
     div{

+ 1 - 1
src/views/statisticalAnalysis/processAnalysis/pasture/index.vue

@@ -1224,7 +1224,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{padding-top:10px;clear: both;}
-  .table{margin-top:10px;}
+  
   /deep/.el-table--scrollable-y .el-table__body-wrapper{
     bottom: 15px;
   }

+ 1 - 1
src/views/systemManagement/customboard2/ChartPanel2/index.vue

@@ -1228,5 +1228,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 1 - 1
src/views/systemManagement/dataSynchronization/index.vue

@@ -227,5 +227,5 @@ time3:"",
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  

+ 1 - 1
src/views/systemManagement/groupInformation/index.vue

@@ -214,5 +214,5 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .table{margin-top:10px;}
+  
  </style>

+ 135 - 135
src/views/systemManagement/labelManagement/index.vue

@@ -10,9 +10,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -63,7 +63,7 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <!-- 编辑 -->
-            <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <span class="centerSpan">|</span>
             <el-button class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
           </template>
@@ -91,68 +91,68 @@
           </el-row>
           <div style="width: 155px;">
             <el-button style="float: right;margin-bottom: 10px;" icon="el-icon-plus" class="success" @click="handleNewLabelValue">新增标签值</el-button>
-          </div>
-          <el-table
-            :key="create.table.tableKey"
-            v-loading="create.table.listLoading"
-            element-loading-text="给我一点时间"
-            :data="create.table.list"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-          >
-            <el-table-column type="selection" align="center" width="50" />
-            <el-table-column label="序号" align="center" type="index" width="50px">
-              <template slot-scope="scope">
-                <span v-if="create.table.pageNum">{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
-                <span v-else>1</span>
-              </template>
-            </el-table-column>
-            <el-table-column label="标签值" min-width="110px" align="center">
-              <template slot-scope="scope">
-                <span v-if="scope.row.NoEdit">{{ scope.row.gpsCode }}</span>
-                <el-input v-if="scope.row.Edit" v-model="scope.row.gpsCode" placeholder="标签值" style="width:80%;padding:10px 0;" />
-              </template>
-            </el-table-column>
-            <el-table-column label="标签说明" min-width="110px" align="center">
-              <template slot-scope="scope">
-                <span v-if="scope.row.NoEdit">{{ scope.row.gpsName }}</span>
-                <el-input v-if="scope.row.Edit" v-model="scope.row.gpsName" placeholder="标签说明" style="width:80%;padding:10px 0;" />
-              </template>
-            </el-table-column>
-            <el-table-column label="标签牧场" min-width="110px" align="center">
-              <template slot-scope="scope">
-                <span v-if="scope.row.NoEdit">{{ scope.row.tname }}</span>
-                <el-select v-if="scope.row.Edit" v-model="scope.row.tmrId" @change="(value)=> {handleAssociatedDevicesChange(value,scope.row)}">
-                  <el-option v-for="item in labelRanchList" :key="item.id" :label="`名称:${item.tname} 编号:${item.eqcode}类型:${item.tclassname}`" :value="item.id" />
-                </el-select>
-              </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-              <template slot-scope="{row}">
-                <!-- 新增 -->
-                <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="NewLabelcreateData(row)" />
-                <span v-if="row.isCreate" class="centerSpan">|</span>
-                <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createNewLabelCancel(row)" />
-                <!-- 编辑 -->
-                <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleNewLabelUpdate(row)" />
-                <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
-                <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleNewLabelRowDelete(row)" />
-                <!-- 编辑保存 -->
-                <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="NewLabelupdateData(row)" />
-                <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-                <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="NewLabelupdateCancel(row)" />
-              </template>
-            </el-table-column>
+          </div>
+          <el-table
+            :key="create.table.tableKey"
+            v-loading="create.table.listLoading"
+            element-loading-text="给我一点时间"
+            :data="create.table.list"
+            border
+            fit
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
+          >
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" align="center" type="index" width="50px">
+              <template slot-scope="scope">
+                <span v-if="create.table.pageNum">{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
+                <span v-else>1</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="标签值" min-width="110px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.gpsCode }}</span>
+                <el-input v-if="scope.row.Edit" v-model="scope.row.gpsCode" placeholder="标签值" style="width:80%;padding:10px 0;" />
+              </template>
+            </el-table-column>
+            <el-table-column label="标签说明" min-width="110px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.gpsName }}</span>
+                <el-input v-if="scope.row.Edit" v-model="scope.row.gpsName" placeholder="标签说明" style="width:80%;padding:10px 0;" />
+              </template>
+            </el-table-column>
+            <el-table-column label="标签牧场" min-width="110px" align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.NoEdit">{{ scope.row.tname }}</span>
+                <el-select v-if="scope.row.Edit" v-model="scope.row.tmrId" @change="(value)=> {handleAssociatedDevicesChange(value,scope.row)}">
+                  <el-option v-for="item in labelRanchList" :key="item.id" :label="`名称:${item.tname} 编号:${item.eqcode}类型:${item.tclassname}`" :value="item.id" />
+                </el-select>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
+              <template slot-scope="{row}">
+                <!-- 新增 -->
+                <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="NewLabelcreateData(row)" />
+                <span v-if="row.isCreate" class="centerSpan">|</span>
+                <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createNewLabelCancel(row)" />
+                <!-- 编辑 -->
+                <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleNewLabelUpdate(row)" />
+                <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleNewLabelRowDelete(row)" />
+                <!-- 编辑保存 -->
+                <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="NewLabelupdateData(row)" />
+                <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+                <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="NewLabelupdateCancel(row)" />
+              </template>
+            </el-table-column>
           </el-table>
-        </el-form>
-        <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-          <el-button class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+          <el-button class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
+          <el-button class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
@@ -168,7 +168,7 @@ export default {
   name: 'LabelManagement',
   components: { Pagination },
   data() {
-    return {
+    return {
       labelRanchList: [],
       isRoleEdit: [],
       labelCategoryList: [], // 标签类别
@@ -197,17 +197,17 @@ export default {
       create: {
         dialogFormVisible: false,
         rules: {},
-        temp: {},
-        table: {
-          getdataListParm: {
-            name: 'getDriverList', page: 1, offset: 1, pagecount: parseInt(Cookies.get('pageCount')),
-            returntype: 'Map',
-            parammaps: { }
-          },
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: false
+        temp: {},
+        table: {
+          getdataListParm: {
+            name: 'getDriverList', page: 1, offset: 1, pagecount: parseInt(Cookies.get('pageCount')),
+            returntype: 'Map',
+            parammaps: { }
+          },
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: false
         }
       },
       textMap: {
@@ -275,63 +275,63 @@ export default {
       this.create.dialogFormVisible = true
     },
     handleNewLabelValue() {
-      console.log('新增标签值')
-      for (let i = 0; i < this.create.table.list.length; i++) {
-        if (this.create.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
-          return false
-        }
-      }
-      this.create.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'gpsCode': '', 'gpsName': '', 'tmrId': '', 'remark': '' })
-    },
-    NewLabelcreateData() {
-      console.log('点击了新增标签新增保存')
-    },
-    createData() {
-      console.log('点击了新增保存')
-    },
-    createNewLabelCancel(row) {
-      console.log('点击了新增标签新增取消')
-      for (let i = 0; i < this.create.table.list.length; i++) {
-        if (row.myId === this.create.table.list[i].myId) {
-          var listIndex = this.create.table.list.indexOf(this.create.table.list[i])
-        }
-        if (listIndex > -1) {
-          this.create.table.list.splice(listIndex, 1)
-          return
-        }
-      }
-    },
-    handleNewLabelUpdate(row) {
-      for (let i = 0; i < this.create.table.list.length; i++) {
-        if (this.create.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
-          return false
-        }
-      }
-      // 编辑true,不可编辑false
-      row.Edit = true
-      row.NoEdit = false
-      // 新增false,编辑false,编辑保存true
-      row.isCreate = false
-      row.isUpdate = false
-      row.isUpdateSave = true
-    },
-    handleNewLabelRowDelete() {
-      console.log('点击了新增标签编辑删除')
-    },
-    NewLabelupdateData() {
-      console.log('点击了新增标签编辑保存')
-    },
-    NewLabelupdateCancel(row) {
-      console.log('点击了编辑取消')
-      // 编辑false,不可编辑true
-      row.Edit = false
-      row.NoEdit = true
-      // 新增false,编辑true,编辑保存false
-      row.isCreate = false
-      row.isUpdate = true
-      row.isUpdateSave = false
+      console.log('新增标签值')
+      for (let i = 0; i < this.create.table.list.length; i++) {
+        if (this.create.table.list[i].Edit == true) {
+          this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
+          return false
+        }
+      }
+      this.create.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'gpsCode': '', 'gpsName': '', 'tmrId': '', 'remark': '' })
+    },
+    NewLabelcreateData() {
+      console.log('点击了新增标签新增保存')
+    },
+    createData() {
+      console.log('点击了新增保存')
+    },
+    createNewLabelCancel(row) {
+      console.log('点击了新增标签新增取消')
+      for (let i = 0; i < this.create.table.list.length; i++) {
+        if (row.myId === this.create.table.list[i].myId) {
+          var listIndex = this.create.table.list.indexOf(this.create.table.list[i])
+        }
+        if (listIndex > -1) {
+          this.create.table.list.splice(listIndex, 1)
+          return
+        }
+      }
+    },
+    handleNewLabelUpdate(row) {
+      for (let i = 0; i < this.create.table.list.length; i++) {
+        if (this.create.table.list[i].Edit == true) {
+          this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
+          return false
+        }
+      }
+      // 编辑true,不可编辑false
+      row.Edit = true
+      row.NoEdit = false
+      // 新增false,编辑false,编辑保存true
+      row.isCreate = false
+      row.isUpdate = false
+      row.isUpdateSave = true
+    },
+    handleNewLabelRowDelete() {
+      console.log('点击了新增标签编辑删除')
+    },
+    NewLabelupdateData() {
+      console.log('点击了新增标签编辑保存')
+    },
+    NewLabelupdateCancel(row) {
+      console.log('点击了编辑取消')
+      // 编辑false,不可编辑true
+      row.Edit = false
+      row.NoEdit = true
+      // 新增false,编辑true,编辑保存false
+      row.isCreate = false
+      row.isUpdate = true
+      row.isUpdateSave = false
     },
     handleUpdate(row) {
       console.log('编辑')
@@ -397,5 +397,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 8 - 8
src/views/systemManagement/notificationManagement/index.vue

@@ -6,10 +6,10 @@
       <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
       <el-button class="successBorder" @click="handleSearch('table')">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh('table')">重置</el-button>
-    </div>
-    <div class="operation">
-      <el-button class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
-      <el-button class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
+    </div>
+    <div class="operation">
+      <el-button class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+      <el-button class="danger" icon="el-icon-delete" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -39,11 +39,11 @@
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-            <span class="centerSpan">|</span>
+            <span class="centerSpan">|</span>
             <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span class="centerSpan">|</span>
+            <span class="centerSpan">|</span>
             <el-button class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-            <span class="centerSpan">|</span>
+            <span class="centerSpan">|</span>
             <a class="correcting" @click="handleStatisticsRead(row)">已读统计</a>
           </template>
         </el-table-column>
@@ -299,5 +299,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>

+ 1 - 1
src/views/systemManagement/operation/index.vue

@@ -186,7 +186,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
   .seeContent{
     flex: 1;
     height: 100%;

+ 22 - 22
src/views/systemManagement/operationManagement/group/index.vue

@@ -7,9 +7,9 @@
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-    </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
+    </div>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
     </div>
     <div class="table">
       <el-table
@@ -77,17 +77,17 @@
             <a v-if="row.NoEdit && isRoleEdit" class="correcting" @click="handlePageConfiguration(row)">页面配置</a>
             <!-- 新增 -->
             <el-button v-if="row.isCreate && isRoleEdit" icon="el-icon-folder-checked" class="miniSuccess" :disabled="isokDisable" @click="createData(row)" />
-            <span v-if="row.isCreate" class="centerSpan">|</span>
+            <span v-if="row.isCreate" class="centerSpan">|</span>
             <el-button v-if="row.isCreate && isRoleEdit" icon="el-icon-close" class="minCancel" @click="createCancel(row)" />
             <!-- 编辑 -->
-            <span v-if="row.isUpdate" class="centerSpan">|</span>
+            <span v-if="row.isUpdate" class="centerSpan">|</span>
             <el-button v-if="row.isUpdate && isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
             <!-- 关联 -->
-            <span v-if="row.isUpdate" class="centerSpan">|</span>
+            <span v-if="row.isUpdate" class="centerSpan">|</span>
             <a v-if="row.isUpdate" class="correcting" @click="handleRelation(row)">关联</a>
             <!-- 编辑保存 -->
             <el-button v-if="row.isUpdateSave && isRoleEdit" icon="el-icon-folder-checked" class="miniSuccess" :disabled="isokDisable" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
+            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave && isRoleEdit" icon="el-icon-close" class="minCancel" @click="updateCancel(row)" />
           </template>
         </el-table-column>
@@ -116,18 +116,18 @@
     </el-dialog>
     <!-- 关联 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="tab1.relation.dialogFormVisible" :close-on-click-modal="false" width="70%">
-      <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" />
-            {{ textMap[tab1.relation.dialogStatus] }}
-          </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>
+      <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" />
+            {{ textMap[tab1.relation.dialogStatus] }}
+          </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>
         <el-form ref="relationTemp" :rules="rules" label-position="right" :model="tab1.relation.temp" label-width="130px" style="width: 100%;">
           <el-row>
@@ -260,7 +260,7 @@ export default {
     return {
       requestParams: [
         { name: 'getGroupsAllList', offset: 0, pagecount: 0, parammaps: {}}
-      ],
+      ],
       dialogFull: false,
       isRoleEdit: [],
       stateList: [{ id: 1, name: '启用' }, { id: 0, name: '禁止' }], // 状态
@@ -703,7 +703,7 @@ export default {
     },
     handleRelation(row) {
       this.tab1.relation.temp = Object.assign({}, row)
-      console.log('关联', this.tab1.relation.temp)
+      console.log('关联', this.tab1.relation.temp)
       this.dialogFull = false
       this.tab1.relation.dialogStatus = 'relation'
       this.tab1.relation.dialogFormVisible = true
@@ -851,7 +851,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .table{margin-top:10px;}
+  
   .inside-base {
     position: relative;
   }

+ 8 - 8
src/views/systemManagement/operationManagement/pasture/index.vue

@@ -10,9 +10,9 @@
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-    </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
+    </div>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
     </div>
     <div class="table">
       <el-table
@@ -75,17 +75,17 @@
           <template slot-scope="{row}">
             <!-- 页面权限 -->
             <a v-if="row.NoEdit && isRoleEdit" class="correcting" @click="handlePageConfiguration(row)">页面配置</a>
-
+
             <!-- 新增 -->
             <el-button v-if="row.isCreate && isRoleEdit" class="miniSuccess" icon="el-icon-folder-checked" :disabled="isokDisable" @click="createData(row)" />
-            <span v-if="row.isCreate && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isCreate && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isCreate && isRoleEdit" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
             <!-- 编辑 -->
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <!-- 编辑保存 -->
             <el-button v-if="row.isUpdateSave && isRoleEdit" class="miniSuccess" icon="el-icon-folder-checked" :disabled="isokDisable" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
           </template>
         </el-table-column>
@@ -523,7 +523,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .table{margin-top:10px;}
+  
   .inside-base {
     position: relative;
   }

+ 1 - 1
src/views/systemManagement/ranchInformation/index.vue

@@ -274,7 +274,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
   $width:350px;
   $left:325px;
   .selectInput{

+ 1 - 1
src/views/systemManagement/role/index.vue

@@ -906,7 +906,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
   .inside-base {
     position: relative;
   }

+ 8 - 8
src/views/systemManagement/user/index.vue

@@ -11,9 +11,9 @@
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
+    <div class="operation">
+      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
+      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="handleDelete">删除</el-button>
     </div>
     <div class="table">
       <el-table
@@ -81,18 +81,18 @@
           <template slot-scope="{row}">
             <!-- 新增 -->
             <el-button v-if="row.isCreate && isRoleEdit" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-            <span v-if="row.isCreate && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isCreate && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isCreate && isRoleEdit" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
             <!-- 重置密码 -->
             <a v-if="row.isUpdate && isRoleEdit" class="correcting" size="mini" style="width: 80px;" @click="handleResetPassword(row)">重置密码</a>
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
             <!-- 编辑 -->
             <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdate && isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
             <!-- 编辑保存 -->
             <el-button v-if="row.isUpdateSave && isRoleEdit" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
+            <span v-if="row.isUpdateSave && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
           </template>
         </el-table-column>
@@ -453,5 +453,5 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  .table{margin-top:10px;}
+  
  </style>