Browse Source

饲料表手动排序,剩料计划创建编辑行内转弹窗

Epans 2 years ago
parent
commit
e76ccdbce8

+ 5 - 2
.env.development

@@ -3,11 +3,14 @@ ENV = 'development'
 
 # base api
 # 测试线
-VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
+# VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
+
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+
 # 沙巍
 # VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
 # 白少杰
-# VUE_APP_BASE_API = 'http://192.168.1.90:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.90:8081/'
 
 #=====
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

BIN
dist20220401.zip


+ 172 - 91
src/views/basicData/feedTable/index.vue

@@ -34,15 +34,23 @@
       </div>
       <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>
-      <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">饲料库</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>
+      <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">饲料库</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>
+
+
     </div>
 
     <div class="table">
       <el-table
+        id="table"
         :key="table.tableKey"
         v-loading="table.listLoading"
         element-loading-text="给我一点时间"
@@ -155,33 +163,36 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleNutritive (row)">营养价值</a>
+            <a class="correcting" @click="handleNutritive (row)">营养价值</a>
             <span class="centerSpan">|</span>
-            <a v-if="isRoleEdit" class="correcting" @click="handleRelation(row)">关联</a>
+            <a v-if="isRoleEdit" class="correcting" @click="handleRelation(row)">关联</a>
             <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
-            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <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>
-      <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+
+      <!-- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" /> -->
+
+         <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%">
-      <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="155px" style="width: 100%;margin:0 auto 50px">
           <el-row>
@@ -200,8 +211,8 @@
                 <el-select v-model="create.temp.fclassid" filterable placeholder="饲料类别" class="filter-item" style="width: 100%;" @change="changeFeedList">
                   <el-option v-for="item in feedTypeList" :key="item.id" :label="item.mixname" :value="item.id" />
                 </el-select>
-
-              </el-form-item></el-col>
+              </el-form-item>
+              </el-col>
             <el-col :span="6">
               <el-form-item label="唯一编码:" prop="feedcode">
                 <el-input ref="feedcode" v-model="create.temp.feedcode" class="filter-item" placeholder="请输入唯一编码" type="text" />
@@ -322,18 +333,18 @@
 
     <!-- 饲料库 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="feedBank.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[feedBank.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[feedBank.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">
         <div class="search">
           <el-input v-model="feedBank.getdataListParm.parammaps.fname" placeholder="饲料名称" style="width: 130px;" class="filter-item" clearable />
@@ -459,18 +470,18 @@
 
     <!-- 关联 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="relation.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[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[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 class="app-add">
         <div class="search">
           <el-input v-model="relation.getdataListParm.parammaps.fname" placeholder="饲料名称" style="width: 130px;" class="filter-item" clearable />
@@ -591,18 +602,18 @@
     </el-dialog>
     <!-- 营养价值 -->
     <el-dialog :fullscreen="dialogFull" :visible.sync="nutritive.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[nutritive.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[nutritive.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="nutritive.rules" :model="nutritive.temp" label-position="right" label-width="160px" style="width: 100%;margin:0 auto 50px">
           <el-row>
@@ -680,6 +691,7 @@
 <script>
 import { GetDataByName, PostDataByName, failproccess, ExecDataByConfig, GetDataByNames, checkButtons } from '@/api/common'
 import Cookies from 'js-cookie'
+import Sortable from 'sortablejs'
 import Pagination from '@/components/Pagination'
 import { MessageBox } from 'element-ui'
 export default {
@@ -707,7 +719,7 @@ export default {
     }
   },
   data() {
-    return {
+    return {
       dialogFull: false,
       isInforvalue: false,
       isRoleEdit: [],
@@ -716,9 +728,9 @@ export default {
         { name: 'getFeedclassByBig', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getDictByName2', offset: 0, pagecount: 0, params: ['计划类型'] },
         { name: 'getTMRListEnableTypeFeed', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '4' }}
-      ],
-      requestParams2: {
-        name: 'getSysoptEnable', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), inforname: 'isSmallMaterial' }
+      ],
+      requestParams2: {
+        name: 'getSysoptEnable', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), inforname: 'isSmallMaterial' }
       },
       enableList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用
       feedSourcesList: [{ id: '0', name: '系统内置' }, { id: '1', name: '用户自定义' }], // 饲料来源
@@ -834,7 +846,9 @@ export default {
       selectList: [],
       requestParam: {},
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
+      cellStyle: { padding: 0 + 'px' },
+      dropState: false,
+      isOrder: true
 
     }
   },
@@ -854,7 +868,7 @@ export default {
   created() {
     this.getList()
     this.getDownList()
-    this.getButtons()
+    this.getButtons()
     this.getInforvalueList()
   },
 
@@ -863,20 +877,20 @@ export default {
       const Edit = 'FeedTable'
       const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
       this.isRoleEdit = isRoleEdit
-    },
-
-    getInforvalueList() {
-      GetDataByName(this.requestParams2).then(response => {
-        if (response.data !== null) {
-          if (response.data.list[0].inforvalue == 0) {
-            this.isInforvalue = false
-          } else {
-            this.isInforvalue = true
-          }
-        } else {
-          this.isInforvalue = false
-        }
-      })
+    },
+
+    getInforvalueList() {
+      GetDataByName(this.requestParams2).then(response => {
+        if (response.data !== null) {
+          if (response.data.list[0].inforvalue == 0) {
+            this.isInforvalue = false
+          } else {
+            this.isInforvalue = true
+          }
+        } else {
+          this.isInforvalue = false
+        }
+      })
     },
     getDownList() {
       GetDataByNames(this.requestParams).then(response => {
@@ -929,7 +943,7 @@ export default {
       this.create.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: '', jmp: '0' }
     },
     // 计划类型
-    changePlanList(item) {
+    changePlanList(item) {
       console.log(item, '======')
       this.create.temp.printgroup = this.planTypeList.find(obj => obj.value === item).label
     },
@@ -955,7 +969,7 @@ export default {
     // 新增
     handleCreate() {
       console.log('点击了新增')
-      this.resetTemp()
+      this.resetTemp()
       this.dialogFull = false
       this.create.dialogStatus = 'create'
       this.create.dialogFormVisible = true
@@ -1035,7 +1049,7 @@ export default {
     // 编辑
     handleUpdate(row) {
       console.log('点击了编辑', row)
-      this.create.dialogStatus = 'update'
+      this.create.dialogStatus = 'update'
       this.dialogFull = false
       this.create.dialogFormVisible = true
       row.fclassid = String(row.fclassid)
@@ -1043,9 +1057,9 @@ export default {
       row.autosecond = String(row.autosecond)
       row.confirmstart = String(row.confirmstart)
       row.enable = String(row.enable)
-      row.jmp = String(row.jmp)
-      if (row.printgroupid !== '') {
-        row.printgroup = this.planTypeList.find(obj => obj.value == row.printgroupid).label
+      row.jmp = String(row.jmp)
+      if (row.printgroupid !== '') {
+        row.printgroup = this.planTypeList.find(obj => obj.value == row.printgroupid).label
       }
 
       this.create.temp = Object.assign({}, row)
@@ -1054,7 +1068,7 @@ export default {
       if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
       if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
       if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
-      if (this.create.temp.smtmrid == '-1') { this.create.temp.smtmrid = '' }
+      if (this.create.temp.smtmrid == '-1') { this.create.temp.smtmrid = '' }
       console.log(this.create.temp, '=====123')
     },
     updateData() {
@@ -1110,7 +1124,7 @@ export default {
           if (this.create.temp.uprice == '') { this.create.temp.uprice = '0' }
           if (this.create.temp.unitweight == '') { this.create.temp.unitweight = '0' }
           if (this.create.temp.autozone == '') { this.create.temp.autozone = '0' }
-          if (this.create.temp.trgaddress == '') { this.create.temp.trgaddress = '0' }
+          if (this.create.temp.trgaddress == '') { this.create.temp.trgaddress = '0' }
 
           PostDataByName(this.requestParam).then(response => {
             console.log('新增保存发送参数', this.requestParam)
@@ -1133,7 +1147,7 @@ export default {
 
     // 饲料库
     handleFeedBank() {
-      console.log('点击了饲料库')
+      console.log('点击了饲料库')
       this.dialogFull = false
       this.feedBank.dialogStatus = 'feedBank'
       this.feedBank.dialogFormVisible = true
@@ -1170,7 +1184,7 @@ export default {
 
     // 关联
     handleRelation(row) {
-      console.log('点击了关联')
+      console.log('点击了关联')
       this.dialogFull = false
       this.relation.dialogStatus = 'relation'
       this.relation.dialogFormVisible = true
@@ -1275,7 +1289,7 @@ export default {
     },
     // 营养价值
     handleNutritive(row) {
-      console.log('点击了营养价值', row)
+      console.log('点击了营养价值', row)
       this.dialogFull = false
       this.nutritive.dialogStatus = 'nutritive'
       this.nutritive.dialogFormVisible = true
@@ -1477,7 +1491,74 @@ 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': 'updateFeedSort', '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])
+        }
+      })
+    },
+
+
   }
 }
 </script>

+ 27 - 26
src/views/basicData/groupColumn/index.vue

@@ -30,9 +30,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
@@ -84,7 +84,8 @@
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.autosecondname }}</span>
             <el-select v-if="scope.row.Edit" v-model="scope.row.autosecond" filterable class="filter-item" style="width: 95%;padding:10px 0;" @change="changeAutosecond">
-              <el-option v-for="item in jumpDelayList" :key="item.value" :label="item.label" :value="item.value" />
+              <el-option v-for="item in jumpDelayList" :key="item.value" :label="item.label" :value="item.value" />  
+              <!-- <el-option v-for="item in jumpDelayList" :key="item.label" :label="item.label" :value="item.label" /> -->
             </el-select>
           </template>
         </el-table-column>
@@ -100,18 +101,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>
@@ -339,11 +340,11 @@ export default {
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()
-        } else {
-          const isRepeat = new RegExp('Duplicate entry :bar_bcode')
-          if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: '栏舍编号不可重复,请重新录入', duration: 2000 })
-            return false
+        } else {
+          const isRepeat = new RegExp('Duplicate entry :bar_bcode')
+          if (isRepeat.test(response.data)) {
+            this.$notify({ type: 'error', message: '栏舍编号不可重复,请重新录入', duration: 2000 })
+            return false
           }
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         }
@@ -447,11 +448,11 @@ export default {
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList()
-        } else {
-          const isRepeat = new RegExp('Duplicate entry :bar_bcode')
-          if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: '栏舍编号不可重复,请重新录入', duration: 2000 })
-            return false
+        } else {
+          const isRepeat = new RegExp('Duplicate entry :bar_bcode')
+          if (isRepeat.test(response.data)) {
+            this.$notify({ type: 'error', message: '栏舍编号不可重复,请重新录入', duration: 2000 })
+            return false
           }
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         }

+ 74 - 73
src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -1,9 +1,9 @@
-<template>
-  <div class="app-container">
-    <div class="search">
-      <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" @change="changeFrequency">
-        <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
+<template>
+  <div class="app-container">
+    <div class="search">
+      <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" @change="changeFrequency">
+        <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float:left;" @click="handleCreate">新增车次
@@ -165,7 +165,7 @@
     </el-dialog>
 
     <!-- 新增、编辑 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="create.dialogFormVisible" :before-close="close" :close-on-click-modal="false" width="90%">
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="create.dialogFormVisible" :before-close="close" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -189,7 +189,8 @@
             <el-col :span="8">
               <el-form-item label="TMR编号:" prop="tmrid2">
                 <el-select v-model="create.temp.tmrid2" style="width: 100%;" placeholder="TMR编号" @change="changeTMRNumber">
-                  <el-option v-for="item in equipmentList" :key="item.id" :label="`${item.tclassname}/${item.eqcode}`" :value="item.id" />
+                  <!-- <el-option v-for="item in equipmentList" :key="item.id" :label="`${item.tclassname}/${item.eqcode}`" :value="item.id" /> -->
+                    <el-option v-for="item in equipmentList" :key="item.id" :label="`${item.tclassname}/${item.eqcode}`" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -347,27 +348,27 @@
         </div>
       </div>
     </el-dialog>
-  </div>
-</template>
-
-<script>
+  </div>
+</template>
+
+<script>
 import Cookies from 'js-cookie'
 import draggable from 'vuedraggable'
 import Sortable from 'sortablejs'
 import { checkButtons, ExecDataByConfig, postJson } from '@/api/common'
-import { MessageBox } from 'element-ui'
+import { MessageBox } from 'element-ui'
 export default {
   components: {
     draggable
-  },
-  data() {
+  },
+  data() {
     return {
       isRoleEdit: [],
       rowStyle: { maxHeight: 25 + 'px', height: 25 + 'px' },
       cellStyle: { padding: 0 + 'px' },
-      height: document.body.clientHeight - 220, // table高度
-      table: {
-        getdataListParm: {
+      height: document.body.clientHeight - 220, // table高度
+      table: {
+        getdataListParm: {
           page: 1,
           offset: 1,
           pagecount: 0,
@@ -376,26 +377,26 @@ export default {
             pastureid: Cookies.get('pastureid'),
             times: 1,
             refresh: 1
-          }
-        },
-        tableKey: 0,
-        list: [],
-        total: 0,
-        listLoading: false
-      },
-      frequencyList: [], // 班次
-      maxTime: {
-        getMaxTimesParm: {
-          name: 'getSysoptEnable',
-          page: 1,
-          offset: 1,
-          pagecount: 1,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'times'
-          }
-        }
+          }
+        },
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: false
+      },
+      frequencyList: [], // 班次
+      maxTime: {
+        getMaxTimesParm: {
+          name: 'getSysoptEnable',
+          page: 1,
+          offset: 1,
+          pagecount: 1,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            inforname: 'times'
+          }
+        }
       },
       // 是否显示小料拆分
       isInforvalue: false,
@@ -424,10 +425,10 @@ export default {
         dialogFormVisible: false,
         dialogStatus: '',
         temp: { sel: 1, tmrid: '', tmrid2: '', maxweight: '', issplit: 1, begintime: '', sumweight: 0, display: '', times: 1, ftid: '', ftname: '', tmrname: '', maxweight: '' },
-        rules: {
-          tmrid2: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'number', required: true, message: '必填', trigger: 'blur' }],
-          ftid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        rules: {
+          tmrid2: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
+          times: [{ type: 'number', required: true, message: '必填', trigger: 'blur' }],
+          ftid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
         },
         listLoadingTimes: false,
         list1: [],
@@ -437,14 +438,14 @@ export default {
       TMRNumberList: [], // TMR编号
       equipmentList: [], // 撒料设备
       templateFormulationList: [], // 模板配方
-      isDispaly: false
-    }
-  },
+      isDispaly: false
+    }
+  },
   created() {
-    this.getButtons()
-    this.getIsDisplay()
-    this.getList()
-  },
+    this.getButtons()
+    this.getIsDisplay()
+    this.getList()
+  },
   methods: {
     getButtons() {
       const Edit = 'MaterialIssuancePlan'
@@ -520,34 +521,34 @@ export default {
           this.isInforvalue = false
         }
       })
-    },
+    },
     getIsDisplay() {
       const url = 'authdata/GetDataByName'
-      const data = this.maxTime.getMaxTimesParm
-      postJson(url, data).then(response => {
-        console.log(response.data.list[0].inforvalue)
-        if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: 1, name: '第一班' }]
-        } else if (response.data.list[0].inforvalue == 2) {
+      const data = this.maxTime.getMaxTimesParm
+      postJson(url, data).then(response => {
+        console.log(response.data.list[0].inforvalue)
+        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) {
+          ]
+        } 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) {
+          ]
+        } else if (response.data.list[0].inforvalue == 4) {
           this.frequencyList = [
             { id: 1, name: '第一班' },
             { id: 2, name: '第二班' },
             { id: 3, name: '第三班' },
             { id: 4, name: '第四班' }
-          ]
-        }
-      })
+          ]
+        }
+      })
     },
 
     getList() {
@@ -575,9 +576,9 @@ export default {
         this.table.listLoading = false
       })
     },
-    changeFrequency(val) {
-      console.log('选择了班次', val)
-      this.getList()
+    changeFrequency(val) {
+      console.log('选择了班次', val)
+      this.getList()
     },
     // 行内删除
     handleRowDelete(row) {
@@ -942,7 +943,7 @@ export default {
     },
     handleUpdate(row) {
       console.log(row)
-      console.log(this.equipmentList)
+      console.log("equipmentList",this.equipmentList)
       this.getDownList()
       this.dialogFull = false
       this.create.dialogStatus = 'update'
@@ -1315,11 +1316,11 @@ export default {
       const vue = this
       var myComponent = () => import('./historyRecord.vue')
       return vue.historyRecord.myComponent = myComponent
-    }
-  }
-}
-</script>
-
+    }
+  }
+}
+</script>
+
 <style lang="scss" scoped>
   .list{width: 60px;display: inline-block;margin: 5px 5px;text-align: center;
     .tmrname{
@@ -1392,7 +1393,7 @@ export default {
         }
        }
      }
-   }
+   }
 </style>
 <style lang="scss" >
 

+ 920 - 293
src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -15,7 +15,7 @@
     </div>
     <div class="search" />
 
-    <div class="table">
+    <!-- <div class="table">
       <el-table
         id="table"
         :key="table.tableKey"
@@ -76,12 +76,7 @@
             </el-select>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="时间" min-width="130px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.rtime }}</span>
-            <el-time-picker v-if="scope.row.Edit" v-model="scope.row.rtime" type="datetime" placeholder="选择时间" format="HH:mm" value-format="HH:mm" style="display: inline-block;width: 95%;" />
-          </template>
-        </el-table-column> -->
+    
         <el-table-column label="剩料处理方式" min-width="130px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.treatmethod }}</span>
@@ -111,10 +106,218 @@
             <el-button v-if="row.isUpdateSave && isRoleEdit" class="minCancel" icon="el-icon-close" @click="updateCancel(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> -->
+
+
+    <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-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="80" class-name="small-padding fixed-width" fixed="right">
+          <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>
+            <el-button v-if="row.isCreate && isRoleEdit" 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 && isRoleEdit" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
+            <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> -->
+        <el-table-column label="操作" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+          
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <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" :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>
+      <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:95%;padding:10px 0;" @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">
+                    <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-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>
+        </div>
+      </div>
+    </el-dialog>
+
+
     <!-- 历史记录 -->
     <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="history.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">
@@ -292,6 +495,21 @@ export default {
         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: '',
@@ -343,6 +561,8 @@ export default {
         }
       },
       textMap: {
+        create: '新增',
+        update: '编辑',
         history: '历史记录',
         check: '提示'
       },
@@ -500,72 +720,127 @@ export default {
     },
 
     // 模板新增
+    // handleCreate() {
+    //   console.log('点击了新增车次')
+    //   // 编辑true/不可编辑false
+    //   // 新增操true,编辑false,编辑保存false
+    //   this.dropState = true
+    //   for (let i = 0; i < this.table.list.length; i++) {
+    //     if (this.table.list[i].Edit === true) {
+    //       console.log(123)
+    //       this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
+    //       return false
+    //     }
+    //   }
+    //   var sort = 1
+    //   if (this.table.list.length > 0) {
+    //     sort = parseInt(this.table.list[this.table.list.length - 1].sort) + 1
+    //   } else {
+    //     sort = 1
+    //   }
+    //   this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'sort': sort, 'ftid': '', 'ftname': '', 'tmrcode': '', 'tmrid': '', 'times': '', 'lppcode': '', 'lppid': '', 'rtime': '', barid: '', 'treatmethod': '', 'useinbar': '', 'useinbarid': '' })
+    //   console.log(this.table.list)
+    // },
+
+    // 新增
     handleCreate() {
-      console.log('点击了新增车次')
-      // 编辑true/不可编辑false
-      // 新增操true,编辑false,编辑保存false
-      this.dropState = true
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (this.table.list[i].Edit === true) {
-          console.log(123)
-          this.$message({ type: 'error', message: '当前内容未保存,请点击取消或保存继续进行操作', duration: 2000 })
-          return false
-        }
-      }
-      var sort = 1
-      if (this.table.list.length > 0) {
-        sort = parseInt(this.table.list[this.table.list.length - 1].sort) + 1
-      } else {
-        sort = 1
-      }
-      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1, 'sort': sort, 'ftid': '', 'ftname': '', 'tmrcode': '', 'tmrid': '', 'times': '', 'lppcode': '', 'lppid': '', 'rtime': '', barid: '', 'treatmethod': '', 'useinbar': '', 'useinbarid': '' })
-      console.log(this.table.list)
+      console.log('点击了新增')
+      this.resetTemp()
+      this.dialogFull = false
+      this.create.dialogStatus = 'create'
+      this.create.dialogFormVisible = true
     },
-    // 栏舍
-    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()
+
+    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': '' }
     },
-    // TMR编号
-    changeTMRNumber(item, row) {
-      row.tmrcode = this.TMRNumberList.find(obj => obj.id == item).tname
+
+    // // 栏舍
+    // 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(item) {
+      this.create.temp.qstr = this.barsList.find(obj => obj.id === item).bname
     },
-    // 撒料计划车次跟随列表
+    // // 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 == '') {
-        row.lppcode = ''
+        this.create.temp.lppcode = ''
       } else {
-        row.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
+        this.create.temp.lppcode = this.carFollowList.find(obj => obj.id == item).lppcode
       }
     },
     // 班次
-    changeTimes(item, row) {
-      console.log(item, row)
+    // 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(row)
+      
+      this.getCarFollowList()
     },
     // 撒料计划车次跟随列表
-    getCarFollowList(row) {
+    // 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
-          row.lppid = this.carFollowList[0].id
-          row.lppcode = this.carFollowList[0].lppcode
+           this.create.temp.lppid = this.carFollowList[0].id
+           this.create.temp.lppcode = this.carFollowList[0].lppcode
         }
       })
     },
-    changeResidueDisposal(item, row) {
-      console.log(item, row)
+
+    // 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()
     },
@@ -576,6 +851,20 @@ export default {
         }
       })
     },
+    // // 转头栏舍
+    // 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)
@@ -590,114 +879,245 @@ export default {
       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
-          }
-        }
-      }
+    // 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
-        }
-      }
+    //   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.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
+      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'
+          }
+          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)
+          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(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.create.dialogFormVisible = false
+              this.getList()
+              this.dropState = false
+            }
+          })
+
+ 
         }
       })
     },
+
+
+   
+
     createCancel(row) {
       console.log('点击了新增取消')
       this.dropState = false
@@ -713,21 +1133,85 @@ export default {
     },
 
     // 模板编辑
+    // 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) {
-      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
+      console.log('点击了编辑', row)
+      this.create.dialogStatus = 'update'
+      this.dialogFull = false
+      this.create.dialogFormVisible = true
+
+
       row.temp = {}
       row.temp2 = {}
       if (row.useinbarid == '0') { row.useinbarid = [] }
@@ -781,143 +1265,286 @@ export default {
       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 })
+
+
+
+
+
+
+    // 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 (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 })
+        if (this.create.temp.treatmethod !== '' && this.create.temp.treatmethod == '转投剩料') {
+          if (this.create.temp.useinbarid == '') {
+            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 })
+        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 (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
+        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)
+        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].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(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.create.dialogFormVisible = false
+            this.getList()
+            this.dropState = false
+          }
+        })
         }
       })
-      // this.requestParam.name = 'updateRemainplan'
-      // this.requestParam.parammaps = row
-      // this.requestParam.parammaps.pastureid = Cookies.get('pastureid')
-      // PostDataByName(this.requestParam).then(response => {
-      //   console.log('新增保存发送参数', this.requestParam)
-      //   if (response.msg !== 'fail') {
-      //     this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-      //     this.getList()
-      //     this.dropState = false
-      //   } else {
-      //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-      //   }
-      // })
     },
+
+
+
     updateCancel(row) {
       console.log('点击了编辑取消')
       // 编辑false,不可编辑true