Merge branck master

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -10,6 +10,8 @@
      <el-button v-if="isRoleEdit" class="success" icon="el-icon-open" style="float: left;" @click="handleTakeEffect">启用</el-button>
       <el-button v-if="isRoleEdit" class="danger" icon="el-icon-turn-off" style="float: left;" @click="handleDisable">禁用</el-button>
       <el-button v-if="isRoleEdit" class="success" style="float: left;" @click="handleCheck">校验</el-button>
+
+      <el-button class="import" style="float: right;" @click="handleHistoryRecords">历史记录</el-button>
  
     </div>
  
@@ -95,7 +97,7 @@
             <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)" />
 
-            <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+            <!-- <el-button v-if="isRoleEdit" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" /> -->
 
           </template>
         </el-table-column>
@@ -202,6 +204,78 @@
         <el-button class="save" @click="check.dialogFormVisible=false;">确认</el-button>
       </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">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+             历史记录
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="app-history">
+        <div class="search">
+          <el-date-picker v-model="history.getdataListParm.parammaps.changeTime" 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-column label="栏舍名称" min-width="130px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.barname }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="推料车名称" prop="weight" min-width="130px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.tmrname }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="推料车编号" prop="weight" min-width="130px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.tmrcode }}</span>
+              </template>
+            </el-table-column>
+  
+            
+            <el-table-column label="推料时间（每天）" min-width="130px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.tisms }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="误差时间（分钟）" min-width="180px" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.allowableerror }}</span>
+              </template>
+            </el-table-column>
+           
+          </el-table>
+          <pagination v-show="history.total>0" :total="history.total" :page.sync="history.getdataListParm.offset" :limit.sync="history.getdataListParm.pagecount" @pagination="getHistoryList" />
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer">
+        <el-button class="cancelClose cancelClose1" @click="history.dialogFormVisible = false; ">关闭</el-button>
+      </div>
+    </el-dialog>
     
  
     
@@ -225,6 +299,40 @@ export default {
   data() {
     return {
 
+
+      history: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {},
+        rules: {},
+        tableKey: 0,
+        list: [],
+        total: 0,
+        listLoading: true,
+
+        getdataDateParm: {
+          name: 'getPushingHistoryDate',
+          page: 1,
+          offset: 1,
+          pagecount: 10,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid')
+          }
+        },
+        getdataListParm: {
+          name: 'getPushingHistory',
+          page: 1,
+          offset: 1,
+          pagecount: 10,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            changeTime: ''
+          }
+        }
+      },
+
       tmrCodeList:[
         // {Code: "001", id: 46, name: "一号推料车"},
         //  {Code: "002", id: 47, name: "二号推料车"}
@@ -462,17 +570,17 @@ export default {
             var timeArrRea = this.timetags1
 
             var selectArr = this.selectList
-            var idsArr = []
-            selectArr.forEach(function(item){
+           var idsArr = []
+      selectArr.forEach(function(item){
               idsArr.push(item.id)
-            })
+      })
 
             var timeIdArr = []
 
 
-            idsArr.forEach(function(item){
+            selectArr.forEach(function(item){
               timeArrRea.forEach(function(items){
-                timeIdArr.push({"time":items,"id":item})
+                timeIdArr.push({"time":items,"tmrname":item.tmrname,"tmrid":item.tmrid,"id":item.id})
               }) 
             })
 
@@ -481,10 +589,29 @@ export default {
 
 
 
+            var send_data = {
+              "common":{"returnmap":"0"},
+              "data":[
+										 {
+                       "name":"checkPushing",
+                       "resultmaps":{
+                         "list":timeIdArr
+                        },
+										 "children":[
+                       {
+                         "name":"checkPushing","type":"e","parammaps": {"tmrname":"@checkPushing.tmrname","tmrid":"@checkPushing.tmrid","id":"@checkPushing.id","time":"@checkPushing.time","type":0}
+                         }
+                         ]
+                         }
+              ]}
+
+
+
 
             var send_data2 = {
               "common":{"returnmap":"0"},
               "data":[
+                {"name":"insertPushingHistory","type":"e","parammaps":{"ids":idsArr.join(","),"pastureid":Cookies.get('pastureid')}},
                 {
                   "name":"delPushingDetailByIds",
                   "type":"e",
@@ -499,21 +626,32 @@ export default {
 										 {"pastureid":Cookies.get('pastureid'),"id":"@insertPushingDetail.id","time":"@insertPushingDetail.time","type":0}}]}
 										 ]} 
 
+
+
+      checkDates(send_data).then(response => {
+        console.log(response)
+          if (response.data === true) {
+               ExecDataByConfig(send_data2).then(response => {
+                  console.log('设置推料', send_data2)
+                  console.log('设置推料', 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.create1.dialogFormVisible = false
+                    this.getList()
+                    
+                  }
+                })
+          } else {
+             this.$notify({ title: '设置失败', message: response.data, type: 'warning', duration: 2000 })
+          
+          }
+        })
    
 
-          ExecDataByConfig(send_data2).then(response => {
-              console.log('设置推料', send_data2)
-              console.log('设置推料', 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.create1.dialogFormVisible = false
-                this.getList()
-                
-              }
-            })
+       
     },
 
     handleCreate2() {
@@ -775,15 +913,28 @@ export default {
         return false
       }
      
-      // const positiveInteger = /^[0-9]\d*$/
-      // if (!positiveInteger.test(parseFloat(this.table.temp.ccount))) {
-      //   this.$message({
-      //     type: 'error',
-      //     message: '实际牛头数请输入正整数',
-      //     duration: 2000
-      //   })
-      //   return false
-      // }
+     const positiveInteger = /^[0-9]\d*$/
+      if (!positiveInteger.test(parseFloat(row.allowableerror))) {
+        this.$message({
+          type: 'error',
+          message: '允许误差数请输入0-60正整数',
+          duration: 2000
+        })
+        return false
+      } else if(parseFloat(row.allowableerror) > 60){
+        this.$message({
+          type: 'error',
+          message: '允许误差数请输入0-60正整数',
+          duration: 2000
+        })
+        return false
+      }
+
+
+   
+
+
+
       this.isokDisable = true
       setTimeout(() => {
         this.isokDisable = false
@@ -842,6 +993,7 @@ export default {
         var send_data2 = {
           "common":{"returnmap":"0"},
           "data":[
+            {"name":"insertPushingHistory","type":"e","parammaps":{"ids":row.id,"pastureid":Cookies.get('pastureid')}},
             {"name":"updatePushing","type":"e",
             "parammaps":row
             },
@@ -860,9 +1012,9 @@ export default {
       }
 
 
-        checkDates(send_data).then(response => {
+      checkDates(send_data).then(response => {
         console.log(response)
-          if (response.data === ture) {
+          if (response.data === true) {
               ExecDataByConfig(send_data2).then(response => {
                 console.log('编辑保存发送参数', send_data2)
                 console.log('编辑保存', response)
@@ -924,27 +1076,49 @@ export default {
   
    
     
-    // 删除
-    handleRowDelete(row) {
-      console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        this.selectList = []
-        this.requestParam.name = 'deleteDungsieve'
-        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: '已取消删除' })
+  
+
+
+    // 历史记录
+    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)
+        if (response.data.list !== null) {
+          this.history.getdataListParm.parammaps.changeTime = response.data.list[0].changeTime
+          this.getHistoryList()
+        } else {
+          this.history.getdataListParm.parammaps.changeTime = ''
+        }
+      })
+    },
+    changeDate() {
+      this.getHistoryList()
+    },
+
+    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 = []
+        }
+        setTimeout(() => {
+          this.history.listLoading = false
+        }, 100)
       })
     },