Shan9312 9 месяцев назад
Родитель
Сommit
620c23bb24

BIN
dist-tmr-0319.zip


BIN
dist-tmr-8081-20250319.zip


BIN
dist-tmr-正式-20250319.zip


+ 260 - 242
src/api/common.js

@@ -1,282 +1,292 @@
-import request from '@/utils/request'
-import parseTime from '@/utils/index.js'
+import request from "@/utils/request";
+import parseTime from "@/utils/index.js";
 
 export function checkDates(data) {
   return request({
-    url: '/authdata/checkDates',
-    method: 'post',
-    data
-  })
+    url: "/authdata/checkDates",
+    method: "post",
+    data,
+  });
 }
 
-
-
 export function GetDataByName(data) {
   return request({
-    url: '/authdata/GetDataByName',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetDataByName",
+    method: "post",
+    data,
+  });
 }
 
 export function SyncSCJH(data) {
   return request({
-    url: '/authdata/syncSCJH',
-    method: 'post',
-    data
-  })
+    url: "/authdata/syncSCJH",
+    method: "post",
+    data,
+  });
 }
 
-
 export function processAnalysist(data) {
   return request({
-    url: '/authdata/processAnalysist',
-    method: 'post',
-    data
-  })
+    url: "/authdata/processAnalysist",
+    method: "post",
+    data,
+  });
 }
 
 export function ExeSqlJiade(data) {
   return request({
-    url: '/authdata/exesql',
-    method: 'post',
-    data
-  })
+    url: "/authdata/exesql",
+    method: "post",
+    data,
+  });
 }
 export function dashboardListJiade(data) {
   return request({
-    url: '/authdata/Dashboards',
-    method: 'post',
-    data
-  })
+    url: "/authdata/Dashboards",
+    method: "post",
+    data,
+  });
 }
 export function updateDashboardJiade(data) {
   return request({
-    url: '/authdata/Updatedashboard',
-    method: 'post',
-    data
-  })
+    url: "/authdata/Updatedashboard",
+    method: "post",
+    data,
+  });
 }
 
 export function GetReportform(data) {
   return request({
-    url: '/authdata/GetReportform',
-    method: 'post',
+    url: "/authdata/GetReportform",
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 export function requestbyname(data, requestname) {
   return request({
-    url: '/authdata/' + requestname,
-    method: 'post',
-    data
-  })
+    url: "/authdata/" + requestname,
+    method: "post",
+    data,
+  });
 }
 
 export function GetDataByNameXlsx(data) {
   return request({
-    url: '/authdata/GetDataByName',
-    method: 'post',
+    url: "/authdata/GetDataByName",
+    method: "post",
     data,
-    responseType: 'blob'
-  })
+    responseType: "blob",
+  });
 }
 
 export function GetDataByNames(data) {
   return request({
-    url: '/authdata/GetDataByNames',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetDataByNames",
+    method: "post",
+    data,
+  });
 }
 
 export function PostDataByName(data) {
   return request({
-    url: '/authdata/PostDataByName',
-    method: 'post',
-    data
-  })
+    url: "/authdata/PostDataByName",
+    method: "post",
+    data,
+  });
 }
 export function GetUpkeepPlan(data) {
   return request({
-    url: '/authdata/GetUpkeepPlan',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetUpkeepPlan",
+    method: "post",
+    data,
+  });
 }
 export function GetAccount(data) {
   return request({
-    url: '/authdata/GetAccount',
-    method: 'post',
+    url: "/authdata/GetAccount",
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
-
-export function postJson(url,data) {
+export function postJson(url, data) {
   return request({
     url: url,
-    method: 'post',
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
-export function postJson2(url,data) {
+export function postJson2(url, data) {
   return request({
     url: url,
-    method: 'post',
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
-export function getJson(url,data) {
+export function getJson(url, data) {
   return request({
     url: url + data,
-    method: 'get'
-  })
+    method: "get",
+  });
 }
 
-export function getData(url,data) {
+export function getData(url, data) {
   return request({
     url: url,
-    method: 'post',
+    method: "post",
     timeout: 600000,
-    data
-  })
+    data,
+  });
 }
 
 export function PostDataByNames(data) {
   return request({
-    url: '/authdata/PostDataByNames',
-    method: 'post',
-    data
-  })
+    url: "/authdata/PostDataByNames",
+    method: "post",
+    data,
+  });
 }
 
 export function ExecDataByConfig(data) {
   return request({
-    url: '/authdata/ExecDataByConfig',
-    method: 'post',
-    data
-  })
+    url: "/authdata/ExecDataByConfig",
+    method: "post",
+    data,
+  });
 }
 
 export function getDorm(data) {
   return request({
-    url: '/authdata/getDorm',
-    method: 'post',
+    url: "/authdata/getDorm",
+    method: "post",
     timeout: 6000000,
-    data
-  })
+    data,
+  });
 }
 
 export function removeimage(data) {
   return request({
-    url: '/authdata/removeimage',
-    method: 'post',
-    data
-  })
+    url: "/authdata/removeimage",
+    method: "post",
+    data,
+  });
 }
 
 export function getRecuData(data) {
   return request({
-    url: '/authdata/GetRecuDataByName',
-    method: 'post',
-    data
-  })
+    url: "/authdata/GetRecuDataByName",
+    method: "post",
+    data,
+  });
 }
 export function Autogeneration(data) {
   return request({
-    url: '/authdata/autogeneration',
-    method: 'post',
-    data
-  })
+    url: "/authdata/autogeneration",
+    method: "post",
+    data,
+  });
 }
 export function failproccess(data, notify) {
-  if (data.data.includes('Duplicate')) {
+  if (data.data.includes("Duplicate")) {
     notify({
-      title: '失败',
-      message: '不可以录入重复数据',
-      type: 'error',
-      duration: 2000
-    })
+      title: "失败",
+      message: "不可以录入重复数据",
+      type: "error",
+      duration: 2000,
+    });
   } else {
     notify({
-      title: '失败',
-      message: '数据存在错误,请校验好重新录入,不可以录入数据',
-      type: 'error',
-      duration: 2000
-    })
+      title: "失败",
+      message: "数据存在错误,请校验好重新录入,不可以录入数据",
+      type: "error",
+      duration: 2000,
+    });
   }
 }
 
 export function UpdateDataRelation(data) {
   return request({
-    url: '/authdata/UpdateDataRelation',
-    method: 'post',
-    data
-  })
+    url: "/authdata/UpdateDataRelation",
+    method: "post",
+    data,
+  });
 }
 
 export function transData(a, idStr, pidStr, chindrenStr) {
-  var r = []; var hash = {}; var id = idStr; var pid = pidStr; var children = chindrenStr; var i = 0; var j = 0; var len = a.length
+  var r = [];
+  var hash = {};
+  var id = idStr;
+  var pid = pidStr;
+  var children = chindrenStr;
+  var i = 0;
+  var j = 0;
+  var len = a.length;
   for (; i < len; i++) {
-    hash[a[i][id]] = a[i]
+    hash[a[i][id]] = a[i];
   }
   for (; j < len; j++) {
-    var aVal = a[j]; var hashVP = hash[aVal[pid]]
+    var aVal = a[j];
+    var hashVP = hash[aVal[pid]];
     if (hashVP) {
-      !hashVP[children] && (hashVP[children] = [])
-      hashVP[children].push(aVal)
+      !hashVP[children] && (hashVP[children] = []);
+      hashVP[children].push(aVal);
     } else {
-      r.push(aVal)
+      r.push(aVal);
     }
   }
-  return r
+  return r;
 }
 
 export function checkButtons(buttonsList, PermissionButtons) {
   // console.log(PermissionButtons)
   for (let i = 0; i < buttonsList.length; i++) {
     // if (buttonsList[i].path === PermissionButtons && buttonsList[i].menu_id && buttonsList[i].path) { // path不为空且menu_id不为空时返回true
-    if (buttonsList[i].path === PermissionButtons && buttonsList[i].editbutton === 1) { // path不为空且menu_id不为空时返回true
-      return true
+    if (
+      buttonsList[i].path === PermissionButtons &&
+      buttonsList[i].editbutton === 1
+    ) {
+      // path不为空且menu_id不为空时返回true
+      return true;
     }
   }
-  return false
+  return false;
 }
 
 export function formatJson(filterVal, jsonData) {
-  return jsonData.map(v =>
-    filterVal.map(j => {
-      if (j === 'timestamp') {
-        return parseTime(v[j])
+  return jsonData.map((v) =>
+    filterVal.map((j) => {
+      if (j === "timestamp") {
+        return parseTime(v[j]);
       } else {
-        return v[j]
+        return v[j];
       }
     })
-  )
+  );
 }
 
 export function DownloadExcel(data, filename) {
-  const content = data
-  const blob = new Blob([content])
-  const fileName = filename + '.xlsx'
-  if ('download' in document.createElement('a')) { // 非IE下载
-    const elink = document.createElement('a')
-    elink.download = fileName
-    elink.style.display = 'none'
-    elink.href = URL.createObjectURL(blob)
-    document.body.appendChild(elink)
-    elink.click()
-    URL.revokeObjectURL(elink.href) // 释放URL 对象
-    document.body.removeChild(elink)
-  } else { // IE10+下载
-    navigator.msSaveBlob(blob, fileName)
+  const content = data;
+  const blob = new Blob([content]);
+  const fileName = filename + ".xlsx";
+  if ("download" in document.createElement("a")) {
+    // 非IE下载
+    const elink = document.createElement("a");
+    elink.download = fileName;
+    elink.style.display = "none";
+    elink.href = URL.createObjectURL(blob);
+    document.body.appendChild(elink);
+    elink.click();
+    URL.revokeObjectURL(elink.href); // 释放URL 对象
+    document.body.removeChild(elink);
+  } else {
+    // IE10+下载
+    navigator.msSaveBlob(blob, fileName);
   }
 }
 // 取小数
@@ -285,32 +295,31 @@ export function DownloadExcel(data, filename) {
 //   return parseInt(f * m, 10) / m;
 // }
 export function formatNum(value, n) {
-  console.log(value, n,'====')
-  var f = Math.round(value*Math.pow(10,n))/Math.pow(10,n);
+  console.log(value, n, "====");
+  var f = Math.round(value * Math.pow(10, n)) / Math.pow(10, n);
   var s = f.toString();
-  var rs = s.indexOf('.');
-  if(rs < 0) {
-    if(n==0){
-      s = s
-    }else{
-      s += '.';
+  var rs = s.indexOf(".");
+  if (rs < 0) {
+    if (n == 0) {
+      s = s;
+    } else {
+      s += ".";
     }
   }
-  for(var i = s.length - s.indexOf('.'); i <= n; i++){
+  for (var i = s.length - s.indexOf("."); i <= n; i++) {
     s += "0";
   }
   return s;
 }
 
-export function compareSort(property){
-  return function(a,b){
+export function compareSort(property) {
+  return function (a, b) {
     var value1 = a[property];
     var value2 = b[property];
     return value1 - value2;
-  }
+  };
 }
 
-
 //将日期转换成一年中的第几周
 export function getYearWeek(date) {
   //按照国际标准
@@ -377,7 +386,7 @@ export function getWeekStartAndEnd(count, currentDate) {
   resultArr.push(currentWeekLastDay.format());
   return resultArr;
 }
-Date.prototype.format = function() {
+Date.prototype.format = function () {
   let s = "";
   let mouth =
     this.getMonth() + 1 >= 10
@@ -401,12 +410,15 @@ export function addDays(date, num) {
 }
 
 export function yearDay(long) {
-  var time = new Date(long * 1000)
-  var year = time.getFullYear()
-  var month = (time.getMonth() + 1) < 10 ? '0' + (time.getMonth() + 1) : (time.getMonth() + 1)
-  var date = time.getDate() < 10 ? '0' + time.getDate() : time.getDate()
-  var yearday = { year, month, date }
-  return yearday
+  var time = new Date(long * 1000);
+  var year = time.getFullYear();
+  var month =
+    time.getMonth() + 1 < 10
+      ? "0" + (time.getMonth() + 1)
+      : time.getMonth() + 1;
+  var date = time.getDate() < 10 ? "0" + time.getDate() : time.getDate();
+  var yearday = { year, month, date };
+  return yearday;
 }
 
 // 计算一年中的每一周都是从几号到几号
@@ -417,100 +429,106 @@ export function yearDay(long) {
 // 12月31 日不论是周几,都算为本周的最后一天
 // 参数年份 ,函数返回一个数组,数组里的对象包含 这一周的开始日期和结束日期
 export function whichWeek(year) {
-      var d = new Date(year, 0, 1)
-      while (d.getDay() != 1) {
-        d.setDate(d.getDate() + 1)
-      }
-      const arr = []
-      const longnum = d.setDate(d.getDate())
-      if (longnum > +new Date(year, 0, 1)) {
-        const obj = yearDay(+new Date(year, 0, 1) / 1000)
-        obj.last = yearDay(longnum / 1000 - 86400)
-        arr.push(obj)
-      }
-      const oneitem = yearDay(longnum / 1000)
-      oneitem.last = yearDay(longnum / 1000 + 86400 * 6)
-      arr.push(oneitem)
-      var lastStr
-      for (var i = 0; i < 51; i++) {
-        const long = d.setDate(d.getDate() + 7)
-        const obj = yearDay(long / 1000)
-        obj.last = yearDay(long / 1000 + 86400 * 6)
-        lastStr = long + 86400000 * 6
-        arr.push(obj)
-      }
-      if (lastStr < +new Date(year + 1, 0, 1)) {
-        const obj = yearDay(lastStr / 1000 + 86400)
-        obj.last = yearDay(+new Date(year + 1, 0, 1) / 1000 - 86400)
-        arr.push(obj)
-      } else {
-        arr[arr.length - 1].last = yearDay(+new Date(year + 1, 0, 1) / 1000 - 86400)
-      }
-      return arr
-    }
-
-
-
-   // 剩料新增
-    export function addSurplus(data) {
-      return request({
-        headers: {
-          'Content-type': 'application/json; charset=utf-8'
-        },
-        url: '/authdata/surplus/add',
-        method: 'post',
-        data
-      })
-    }
+  var d = new Date(year, 0, 1);
+  while (d.getDay() != 1) {
+    d.setDate(d.getDate() + 1);
+  }
+  const arr = [];
+  const longnum = d.setDate(d.getDate());
+  if (longnum > +new Date(year, 0, 1)) {
+    const obj = yearDay(+new Date(year, 0, 1) / 1000);
+    obj.last = yearDay(longnum / 1000 - 86400);
+    arr.push(obj);
+  }
+  const oneitem = yearDay(longnum / 1000);
+  oneitem.last = yearDay(longnum / 1000 + 86400 * 6);
+  arr.push(oneitem);
+  var lastStr;
+  for (var i = 0; i < 51; i++) {
+    const long = d.setDate(d.getDate() + 7);
+    const obj = yearDay(long / 1000);
+    obj.last = yearDay(long / 1000 + 86400 * 6);
+    lastStr = long + 86400000 * 6;
+    arr.push(obj);
+  }
+  if (lastStr < +new Date(year + 1, 0, 1)) {
+    const obj = yearDay(lastStr / 1000 + 86400);
+    obj.last = yearDay(+new Date(year + 1, 0, 1) / 1000 - 86400);
+    arr.push(obj);
+  } else {
+    arr[arr.length - 1].last = yearDay(
+      +new Date(year + 1, 0, 1) / 1000 - 86400
+    );
+  }
+  return arr;
+}
 
-    //剩料查询 authdata/surplus/list
+// 剩料新增
+export function addSurplus(data) {
+  return request({
+    headers: {
+      "Content-type": "application/json; charset=utf-8",
+    },
+    url: "/authdata/surplus/add",
+    method: "post",
+    data,
+  });
+}
 
-    export function getSurplus(id){
-      return request({
-        url: '/authdata/surplus/list?pastureId=' + id,
-        method: 'get'
-      })
-    }
+//剩料查询 authdata/surplus/list
 
-    // 删除剩料
+export function getSurplus(id) {
+  return request({
+    url: "/authdata/surplus/list?pastureId=" + id,
+    method: "get",
+  });
+}
 
-    export function delSurplus(data){
-      return request({
-        url: '/authdata/surplus/del',
-        method: 'post',
-        data
-      })
-    }
+// 删除剩料
 
+export function delSurplus(data) {
+  return request({
+    url: "/authdata/surplus/del",
+    method: "post",
+    data,
+  });
+}
 
 export function editWeightHL(data) {
   return request({
-    url: '/authdata/planexec/edit',
-    method: 'POST',
-    data
-  })
+    url: "/authdata/planexec/edit",
+    method: "POST",
+    data,
+  });
 }
 
 export function editWeightSL(data) {
   return request({
-    url: '/authdata/plan2/edit',
-    method: 'POST',
-    data
-  })
+    url: "/authdata/plan2/edit",
+    method: "POST",
+    data,
+  });
 }
 
 export function getPastureData() {
   return request({
-    url: '/admin/special/restartMqtt.html',
-    method: 'POST'
-  })
+    url: "/admin/special/restartMqtt.html",
+    method: "POST",
+  });
 }
 
-
 export function processAnalysistDown(data) {
   return request({
-    url: '/authdata/process/excel',
-    method: 'POST',
-    data
-  })
+    url: "/authdata/process/excel",
+    method: "POST",
+    data,
+  });
+}
+
+export function getSapRoute(data) {
+  return request({
+    url: "/xdmy/sap/leftoverEntry",
+    method: "POST",
+    data,
+  });
 }

+ 70 - 69
src/utils/request.js

@@ -1,143 +1,144 @@
-import axios from 'axios'
-import { MessageBox, Message } from 'element-ui'
-import store from '@/store'
-import { getToken } from '@/utils/auth'
-import Cookies from 'js-cookie';
+import axios from "axios";
+import { MessageBox, Message } from "element-ui";
+import store from "@/store";
+import { getToken } from "@/utils/auth";
+import Cookies from "js-cookie";
 
 //获取当前url
 const DoMainString = document.querySelector("html").getAttribute("domain");
-var URL = process.env.VUE_APP_BASE_API
+var URL = process.env.VUE_APP_BASE_API;
 if (DoMainString) {
-  URL = DoMainString
+  URL = DoMainString;
 }
 
-var reg =  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
-var browserUrl = window.location.hostname
+var reg =
+  /(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)\.(25[0-5]|2[0-4]\d|[0-1]\d{2}|[1-9]?\d)/;
+var browserUrl = window.location.hostname;
 // console.log("========url===",reg.test(browserUrl))
 //  内网跳转公司需要加这块代码
 // 注意: 端口号后面加’/‘ 防止导出报错 如:‘:8081/’
-if (reg.test(browserUrl)){
-  URL = window.location.protocol +"//"+ browserUrl + ":80/"
+if (reg.test(browserUrl)) {
+  URL = window.location.protocol + "//" + browserUrl + ":8081/";
 }
 
-Cookies.set('url',URL)
-console.log(process.env.VUE_APP_BASE_API,'===========URL1111')
-console.log(URL,'===========URL')
+Cookies.set("url", URL);
+console.log(process.env.VUE_APP_BASE_API, "===========URL1111");
+console.log(URL, "===========URL");
 
 const service = axios.create({
   baseURL: URL, // url = base url + request url
   withCredentials: true, // send cookies when cross-domain requests
-  timeout: 60000 ,// request timeout
-})
+  timeout: 60000, // request timeout
+});
 // request interceptor
 service.interceptors.request.use(
-  config => {
+  (config) => {
     // do something before request is sent
     // config.headers['Content-Type'] = 'application/x-www-form-urlencoded;charset=UTF-8'  //此处是增加的代码,设置请求头的类型
     // debugger
-    console.log(process.env.VUE_APP_BASE_API,'process.env.VUE_APP_BASE_API')
-    if (process.env.VUE_APP_BASE_API !== '/dev-api') {
-      config.headers['Content-Type'] = 'application/json;charset=UTF-8'
-      config.withCredentials = false
+    console.log(process.env.VUE_APP_BASE_API, "process.env.VUE_APP_BASE_API");
+    if (process.env.VUE_APP_BASE_API !== "/dev-api") {
+      config.headers["Content-Type"] = "application/json;charset=UTF-8";
+      config.withCredentials = false;
     }
-    console.log(config,'config')
+    console.log(config, "config");
 
     if (store.getters.token) {
       // let each request carry token
       // ['Authorization'] is a custom headers key
       // please modify it according to the actual situation
-      if (process.env.VUE_APP_BASE_API === '/dev-api') {
-        config.headers['X-Token'] = getToken()
+      if (process.env.VUE_APP_BASE_API === "/dev-api") {
+        config.headers["X-Token"] = getToken();
       } else {
-        config.headers['token'] = getToken()
+        config.headers["token"] = getToken();
       }
     }
-    return config
+    return config;
   },
-  error => {
+  (error) => {
     // do something with request error
-    console.log(error) // for debug
-    return Promise.reject(error)
+    console.log(error); // for debug
+    return Promise.reject(error);
   }
-)
+);
 
 // response interceptor
 service.interceptors.response.use(
   /**
    * If you want to get http information such as headers or status
    * Please return  response => response
-  */
+   */
 
   /**
    * Determine the request status by custom code
    * Here is just an example
    * You can also judge the status by HTTP Status Code
    */
-  response => {
-    const res = response.data
+  (response) => {
+    const res = response.data;
 
     // if the custom code is not 20000, it is judged as an error.
     if (res.code !== 200) {
       Message({
         // message: res.msg + res.code,
-        message: '请求超时',
-        type: 'error',
-        duration: 5 * 1000
-      })
+        message: "请求超时",
+        type: "error",
+        duration: 5 * 1000,
+      });
 
       // 50008: Illegal token; 50012: Other clients logged in; 50014: Token expired;
       if (res.code === 50008 || res.code === 50012 || res.code === 50014) {
         // to re-login
-        MessageBox.confirm('你已经注销登陆,你可以取消或重新登陆', '确认注销', {
-          confirmButtonText: '重新登陆',
-          cancelButtonText: '取消',
-          type: 'warning'
+        MessageBox.confirm("你已经注销登陆,你可以取消或重新登陆", "确认注销", {
+          confirmButtonText: "重新登陆",
+          cancelButtonText: "取消",
+          type: "warning",
         }).then(() => {
-          store.dispatch('user/resetToken').then(() => {
-            location.reload()
-          })
-        })
+          store.dispatch("user/resetToken").then(() => {
+            location.reload();
+          });
+        });
       }
       if (res.code === 20002) {
-        store.dispatch('user/resetToken').then(() => {
-          location.reload()
-        })
+        store.dispatch("user/resetToken").then(() => {
+          location.reload();
+        });
       }
       if (res.code === undefined) {
-        return res
+        return res;
       } else {
-        return Promise.reject(new Error(res.message || 'Error'))
+        return Promise.reject(new Error(res.message || "Error"));
       }
     } else {
-      return res
+      return res;
     }
   },
-  error => {
-    console.log('err' + error) // for debug
-    let config = error.config
+  (error) => {
+    console.log("err" + error); // for debug
+    let config = error.config;
     if (!config) {
-      Message({ message: error.message, type: 'error', duration: 5 * 1000 })
-      return Promise.reject(error)
+      Message({ message: error.message, type: "error", duration: 5 * 1000 });
+      return Promise.reject(error);
     }
-    console.log('config==>', config) // for debug
-    console.log('config.__retryCount==>', config.__retryCount) // for debug
+    console.log("config==>", config); // for debug
+    console.log("config.__retryCount==>", config.__retryCount); // for debug
     // 设置请求超时次数
-    config.__retryCount = config.__retryCount || 0
+    config.__retryCount = config.__retryCount || 0;
     if (config.__retryCount >= 3) {
       // Message({ message:error.message, type: 'error', duration: 5 * 1000 })
-      Message({ message:'请求超时', type: 'error', duration: 5 * 1000 })
+      Message({ message: "请求超时", type: "error", duration: 5 * 1000 });
       // Message.error((error && error.data && error.data.msg) || '请求超时')
-      return Promise.reject(error)
+      return Promise.reject(error);
     }
-    config.__retryCount += 1
+    config.__retryCount += 1;
     let backoff = new Promise((resolve) => {
       setTimeout(() => {
-        resolve()
-      }, config.retryDelay || 1000)
-    })
+        resolve();
+      }, config.retryDelay || 1000);
+    });
     return backoff.then(() => {
-      return service(config)
-    })
+      return service(config);
+    });
     // Message({
     //   message: error.message,
     //   type: 'error',
@@ -145,6 +146,6 @@ service.interceptors.response.use(
     // })
     // return Promise.reject(error)
   }
-)
+);
 
-export default service
+export default service;

Разница между файлами не показана из-за своего большого размера
+ 1567 - 606
src/views/formulationPlan/dailyExecutionPlan/index.vue


Разница между файлами не показана из-за своего большого размера
+ 717 - 137
src/views/formulationPlan/materialIssuancePlan/index.vue


+ 1403 - 523
src/views/shedProduction/materialRemainingRecord/index.vue

@@ -1,43 +1,150 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
-      <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-      <el-select v-model="table.getdataListParm.parammaps.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
+      <el-date-picker
+        v-model="table.getdataListParm.parammaps.inputDatetime"
+        class="inputDatetime filter-item"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        style="width: 250px"
+      />
+      <el-button
+        class="el-icon-arrow-left elIconArrowLeft"
+        @click="handleBefore"
+      />
+      <el-button
+        class="el-icon-arrow-right elIconArrowRight"
+        @click="handleNext"
+      />
+      <el-select
+        v-model="table.getdataListParm.parammaps.barid"
+        filterable
+        placeholder="栏舍名称"
+        class="filter-item"
+        style="width: 120px"
+        clearable
+      >
+        <el-option
+          v-for="item in houseNameList"
+          :key="item.id"
+          :label="item.bname"
+          :value="item.id"
+        />
       </el-select>
-      <el-select v-model="record" filterable placeholder="记录" class="filter-item" style="width: 150px;" @change="changeRecord">
-        <el-option v-for="item in recordList" :key="item.id" :label="item.name" :value="item.id" />
+      <el-select
+        v-model="record"
+        filterable
+        placeholder="记录"
+        class="filter-item"
+        style="width: 150px"
+        @change="changeRecord"
+      >
+        <el-option
+          v-for="item in recordList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        />
       </el-select>
-      <el-select v-if="record== '1'" v-model="table.getdataListParm.parammaps.eqcode" filterable placeholder="TMR编号" class="filter-item" style="width: 120px;" clearable>
-        <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.tname" :value="item.eqcode" />
+      <el-select
+        v-if="record == '1'"
+        v-model="table.getdataListParm.parammaps.eqcode"
+        filterable
+        placeholder="TMR编号"
+        class="filter-item"
+        style="width: 120px"
+        clearable
+      >
+        <el-option
+          v-for="item in TMRNumberList"
+          :key="item.id"
+          :label="item.tname"
+          :value="item.eqcode"
+        />
       </el-select>
       <el-button class="successBorder" @click="form_search">查询</el-button>
       <el-button class="successBorder" @click="handleRefresh">重置</el-button>
     </div>
-    <div class="operation" v-if="record== '0'">
-      <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="form_delete">删除</el-button>
-      <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button>
-      <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
-      <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
-        <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
+    <div class="operation" v-if="record == '0'">
+      <el-button
+        v-if="isRoleEdit"
+        icon="el-icon-plus"
+        class="success"
+        @click="handleCreate"
+        >新增</el-button
+      >
+      <el-button
+        v-if="isRoleEdit"
+        icon="el-icon-delete"
+        class="danger"
+        @click="form_delete"
+        >删除</el-button
+      >
+      <el-button
+        v-if="isRoleEdit && sapUpload.isSap"
+        class="success"
+        icon="el-icon-upload2"
+        @click="handleSAPUpload"
+        >SAP上传</el-button
+      >
+      <el-button
+        v-if="isRoleEdit"
+        icon="el-icon-copy-document"
+        class="copy"
+        @click="handleCopy"
+        >复制</el-button
+      >
+      <el-button
+        v-if="dataSynchronization.isDataSynchronization && isRoleEdit"
+        class="success"
+        @click="handleDataUpload"
+        >数据上传</el-button
+      >
+      <el-upload
+        v-if="isRoleEdit"
+        style="float: right"
+        :headers="headers"
+        :data="uploadData"
+        :action="uploadExcelUrl"
+        :show-file-list="false"
+        :before-upload="beforeImport"
+        :on-success="handleImportSuccess"
+      >
+        <el-button class="import" icon="el-icon-download" style="float: right"
+          >导入</el-button
+        >
       </el-upload>
-      <el-dropdown style="float: right;margin-right: 10px;">
+      <el-dropdown style="float: right; margin-right: 10px">
         <el-button class="export" icon="el-icon-upload2">导出</el-button>
         <el-dropdown-menu slot="dropdown">
-          <el-dropdown-item  @click.native="handleExport(1)">导出模板</el-dropdown-item>
-          <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
+          <el-dropdown-item @click.native="handleExport(1)"
+            >导出模板</el-dropdown-item
+          >
+          <el-dropdown-item @click.native="handleExport(2)"
+            >导出数据</el-dropdown-item
+          >
         </el-dropdown-menu>
       </el-dropdown>
     </div>
     <div class="operation" v-else>
-      <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
-        <el-button style="float: right;margin-right: 10px;" class="export" icon="el-icon-upload2" @click="handleExport(3)">导出</el-button>
+      <el-button
+        v-if="dataSynchronization.isDataSynchronization && isRoleEdit"
+        class="success"
+        @click="handleDataUpload"
+        >数据上传</el-button
+      >
+      <el-button
+        style="float: right; margin-right: 10px"
+        class="export"
+        icon="el-icon-upload2"
+        @click="handleExport(3)"
+        >导出</el-button
+      >
     </div>
     <!-- 手动记录 -->
-    <div class="table" v-if="record== '0'">
+    <div class="table" v-if="record == '0'">
       <el-table
         :key="table.tableKey"
         v-loading="table.listLoading"
@@ -46,7 +153,7 @@
         border
         fit
         highlight-current-row
-        style="width: 100%;"
+        style="width: 100%"
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
@@ -56,27 +163,93 @@
         <el-table-column type="selection" align="center" width="50" />
         <el-table-column label="序号" align="center" type="index" width="50px">
           <template slot-scope="scope">
-            <span>{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
+            <span>{{
+              scope.$index + (table.pageNum - 1) * table.pageSize + 1
+            }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
-        <el-table-column label="配方名称" min-width="150px" align="center" prop="ftname" />
+        <el-table-column
+          label="栏舍名称"
+          min-width="150px"
+          align="center"
+          prop="barname"
+        />
+        <el-table-column
+          label="配方名称"
+          min-width="150px"
+          align="center"
+          prop="ftname"
+        />
         <!-- <el-table-column label="收集" min-width="150px" align="center" prop="timesstr" /> -->
-        <el-table-column label="原剩料所属时间" min-width="150px" align="center" prop="remaindate" />
-        <el-table-column label="剩料量(kg)" min-width="150px" align="center" prop="remain" />
-        <el-table-column label="干物质" min-width="150px" align="center" prop="dry" />
-        <el-table-column label="班次(收集)" min-width="90px" align="center" prop="timesstr" />
-        <el-table-column label="收集时间" min-width="100px" align="center" prop="operatetime" />
-        <el-table-column label="操作人" min-width="90px" align="center" prop="emp" />
-        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <el-button v-if="isRoleEdit" :disabled="row.emp == '设备采集'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+        <el-table-column
+          label="原剩料所属时间"
+          min-width="150px"
+          align="center"
+          prop="remaindate"
+        />
+        <el-table-column
+          label="剩料量(kg)"
+          min-width="150px"
+          align="center"
+          prop="remain"
+        />
+        <el-table-column
+          label="干物质"
+          min-width="150px"
+          align="center"
+          prop="dry"
+        />
+        <el-table-column
+          label="班次(收集)"
+          min-width="90px"
+          align="center"
+          prop="timesstr"
+        />
+        <el-table-column
+          label="收集时间"
+          min-width="100px"
+          align="center"
+          prop="operatetime"
+        />
+        <el-table-column
+          label="操作人"
+          min-width="90px"
+          align="center"
+          prop="emp"
+        />
+        <el-table-column
+          label="操作"
+          align="center"
+          width="80"
+          class-name="small-padding fixed-width"
+          fixed="right"
+        >
+          <template slot-scope="{ row }">
+            <el-button
+              v-if="isRoleEdit"
+              :disabled="row.emp == '设备采集'"
+              class="miniSuccess"
+              icon="el-icon-edit-outline"
+              @click="handleUpdate(row)"
+            />
             <span v-if="isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="isRoleEdit" :disabled="row.emp == '设备采集'" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
+            <el-button
+              v-if="isRoleEdit"
+              :disabled="row.emp == '设备采集'"
+              class="miniDanger"
+              icon="el-icon-delete"
+              @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"
+      />
     </div>
     <!-- TMR设备自动记录 -->
     <div class="table" v-else>
@@ -88,47 +261,137 @@
         border
         fit
         highlight-current-row
-        style="width: 98%;"
+        style="width: 98%"
         :row-style="rowStyle"
         :cell-style="cellStyle"
         class="elTable table-fixed"
         :height="myHeight"
       >
         <el-table-column type="selection" align="center" width="50" />
-        <el-table-column label="TMR设备编号" min-width="150px" align="center" prop="eqcode" />
-        <el-table-column label="TMR设备名称" min-width="150px" align="center" prop="eqname" />
-        <el-table-column label="TMR设备类型" min-width="150px" align="center" prop="tclassname" />
-        <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
-        <el-table-column label="收集时间" min-width="150px" align="center" prop="createtime" />
-        <el-table-column label="剩料重量(kg)" min-width="150px" align="center" prop="weight" />
-        <el-table-column label="开始重量(kg)" min-width="150px" align="center" prop="beginweight" />
-        <el-table-column label="结束重量(kg)" min-width="150px" align="center" prop="endweight" />
-        <el-table-column label="驾驶员" min-width="150px" align="center" prop="driver" />
+        <el-table-column
+          label="TMR设备编号"
+          min-width="150px"
+          align="center"
+          prop="eqcode"
+        />
+        <el-table-column
+          label="TMR设备名称"
+          min-width="150px"
+          align="center"
+          prop="eqname"
+        />
+        <el-table-column
+          label="TMR设备类型"
+          min-width="150px"
+          align="center"
+          prop="tclassname"
+        />
+        <el-table-column
+          label="栏舍名称"
+          min-width="150px"
+          align="center"
+          prop="barname"
+        />
+        <el-table-column
+          label="收集时间"
+          min-width="150px"
+          align="center"
+          prop="createtime"
+        />
+        <el-table-column
+          label="剩料重量(kg)"
+          min-width="150px"
+          align="center"
+          prop="weight"
+        />
+        <el-table-column
+          label="开始重量(kg)"
+          min-width="150px"
+          align="center"
+          prop="beginweight"
+        />
+        <el-table-column
+          label="结束重量(kg)"
+          min-width="150px"
+          align="center"
+          prop="endweight"
+        />
+        <el-table-column
+          label="驾驶员"
+          min-width="150px"
+          align="center"
+          prop="driver"
+        />
       </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"
+      />
     </div>
 
     <!-- 新增/编辑 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" v-if='create.dialogFormVisible' width="40%">
+    <el-dialog
+      :fullscreen="dialogFull"
+      :visible.sync="create.dialogFormVisible"
+      :close-on-click-modal="false"
+      v-if="create.dialogFormVisible"
+      width="40%"
+    >
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            <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">
+          <div
+            class="avue-crud__dialog__menu"
+            @click="dialogFull ? (dialogFull = false) : (dialogFull = true)"
+          >
             <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
             <svg-icon v-else icon-class="fullscreen" />
           </div>
         </div>
       </template>
       <div class="app-add">
-        <el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="135px" style="width: 90%;margin:0 auto 50px">
-          <el-row v-if="create.dialogStatus=='create'">
+        <el-form
+          ref="temp"
+          :rules="create.rules"
+          :model="create.temp"
+          label-position="right"
+          label-width="135px"
+          style="width: 90%; margin: 0 auto 50px"
+        >
+          <el-row v-if="create.dialogStatus == 'create'">
             <el-col :span="20">
               <el-form-item label="栏舍名称:" prop="barid">
-                <el-select ref="barid" v-model="create.temp.barid" :disabled="create.dialogStatus=='update'" filterable placeholder="栏舍名称" class="filter-item" style="width: 100%;" @change="changeBar">
-                  <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
+                <el-select
+                  ref="barid"
+                  v-model="create.temp.barid"
+                  :disabled="create.dialogStatus == 'update'"
+                  filterable
+                  placeholder="栏舍名称"
+                  class="filter-item"
+                  style="width: 100%"
+                  @change="changeBar"
+                >
+                  <el-option
+                    v-for="item in houseNameList"
+                    :key="item.id"
+                    :label="item.bname"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -136,23 +399,47 @@
           <el-row v-else>
             <el-col :span="20">
               <el-form-item label="栏舍名称:" prop="barname">
-                <el-input ref="barname" v-model="create.temp.barname" disabled class="filter-item" placeholder="barname" />
+                <el-input
+                  ref="barname"
+                  v-model="create.temp.barname"
+                  disabled
+                  class="filter-item"
+                  placeholder="barname"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <!-- TODO: -->
-          <el-row >
+          <el-row>
             <el-col :span="20">
-              <el-form-item label="配方名称:" >
-                <el-input  v-model="create.temp.ftname" class="filter-item" placeholder="配方名称"  disabled />
+              <el-form-item label="配方名称:">
+                <el-input
+                  v-model="create.temp.ftname"
+                  class="filter-item"
+                  placeholder="配方名称"
+                  disabled
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="20">
-              <el-form-item label="班次(收集):" >
-                <el-select ref="times" v-model="create.temp.times" filterable placeholder="班次(收集)" :disabled="create.dialogStatus=='update'" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+              <el-form-item label="班次(收集):">
+                <el-select
+                  ref="times"
+                  v-model="create.temp.times"
+                  filterable
+                  placeholder="班次(收集)"
+                  :disabled="create.dialogStatus == 'update'"
+                  class="filter-item"
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in frequencyList"
+                    :key="item.id"
+                    :label="item.name"
+                    :value="item.id"
+                  />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -165,9 +452,10 @@
                   v-model="create.temp.remaindate"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  style="width: 100%;"
+                  style="width: 100%"
                   :picker-options="pickerOptions"
-                  placeholder="原剩料所属时间">
+                  placeholder="原剩料所属时间"
+                >
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -176,14 +464,26 @@
           <el-row>
             <el-col :span="20">
               <el-form-item label="剩料量:" prop="remain">
-                <el-input ref="remain" v-model="create.temp.remain" class="filter-item" placeholder="剩料量" type="number" />
+                <el-input
+                  ref="remain"
+                  v-model="create.temp.remain"
+                  class="filter-item"
+                  placeholder="剩料量"
+                  type="number"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="20">
               <el-form-item label="干物质:" prop="dry">
-                <el-input ref="dry" v-model="create.temp.dry" class="filter-item" placeholder="干物质" type="number"  />
+                <el-input
+                  ref="dry"
+                  v-model="create.temp.dry"
+                  class="filter-item"
+                  placeholder="干物质"
+                  type="number"
+                />
               </el-form-item>
             </el-col>
           </el-row>
@@ -191,24 +491,137 @@
           <el-row>
             <el-col :span="20">
               <el-form-item label="收集时间:" prop="operatetime">
-                <el-date-picker v-model="create.temp.operatetime" :disabled="create.dialogStatus=='update'" type="datetime" placeholder="选择处理时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" style="width: 100%;" :clearable="false" />
+                <el-date-picker
+                  v-model="create.temp.operatetime"
+                  :disabled="create.dialogStatus == 'update'"
+                  type="datetime"
+                  placeholder="选择处理时间"
+                  format="yyyy-MM-dd HH:mm"
+                  value-format="yyyy-MM-dd HH:mm"
+                  style="width: 100%"
+                  :clearable="false"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="20">
               <el-form-item label="操作人:" prop="emp">
-                <el-select ref="emp" v-model="create.temp.emp" filterable placeholder="操作人" :disabled="create.dialogStatus=='update'" class="filter-item" style="width: 100%;" @blur="blurEmp">
-                  <el-option v-for="item in create.noteTakerList" :key="item.myId" :label="item.emp" :value="item.emp" />
+                <el-select
+                  ref="emp"
+                  v-model="create.temp.emp"
+                  filterable
+                  placeholder="操作人"
+                  :disabled="create.dialogStatus == 'update'"
+                  class="filter-item"
+                  style="width: 100%"
+                  @blur="blurEmp"
+                >
+                  <el-option
+                    v-for="item in create.noteTakerList"
+                    :key="item.myId"
+                    :label="item.emp"
+                    :value="item.emp"
+                  />
                 </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'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button
+            class="cancelClose"
+            @click="
+              create.dialogFormVisible = false;
+              getList();
+            "
+            >关闭</el-button
+          >
+          <el-button
+            v-if="create.dialogStatus === 'create'"
+            class="save"
+            :disabled="isokDisable"
+            @click="createDataAgain()"
+            >确认新增</el-button
+          >
+          <el-button
+            v-if="
+              create.dialogStatus === 'create' ||
+              create.dialogStatus === 'update'
+            "
+            class="save"
+            :disabled="isokDisable"
+            @click="
+              create.dialogStatus === 'create' ? createData() : updateData()
+            "
+            >确认</el-button
+          >
+        </div>
+      </div>
+    </el-dialog>
+    <!-- / -->
+    <el-dialog
+      :title="textMap[sapUpload.dialogStatus]"
+      :destroy-on-close="true"
+      :visible.sync="sapUpload.dialogFormVisible"
+      :close-on-click-modal="false"
+      width="40%"
+    >
+      <div class="sapUpload">
+        <el-form
+          ref="sapUpload"
+          :rules="sapUpload.rules"
+          :model="sapUpload.temp"
+          label-position="right"
+          label-width="100px"
+          style="width: 100%; margin: 0 auto 50px"
+        >
+          <el-row>
+            <el-col :span="24">
+              <el-form-item label="时间:" prop="date">
+                <el-date-picker
+                  v-if="
+                    sapUpload.dialogStatus != 'udload5' &&
+                    sapUpload.dialogStatus != 'udload4'
+                  "
+                  v-model="sapUpload.temp.date"
+                  :clearable="false"
+                  class="filter-item"
+                  type="date"
+                />
+                <el-date-picker
+                  v-else
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  format="yyyy-MM-dd"
+                  value-format="yyyy-MM-dd"
+                  v-model="dateRange"
+                  :clearable="false"
+                  :picker-options="pickerOptionsT"
+                  @change="handleDateChange"
+                  class="filter-item"
+                  type="daterange"
+                />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer" style="bottom: 20px">
+          <el-button
+            class="cancelClose"
+            @click="
+              sapUpload.dialogFormVisible = false;
+              getList();
+            "
+            >取消</el-button
+          >
+          <el-button
+            class="save"
+            v-if="sapUpload.dialogStatus == 'sapUpload'"
+            :disabled="isokDisable"
+            @click="sapUploadData()"
+            >确认</el-button
+          >
         </div>
       </div>
     </el-dialog>
@@ -216,704 +629,1171 @@
 </template>
 
 <script>
-import { GetDataByName, PostDataByName, failproccess, ExecDataByConfig, GetDataByNames, checkButtons,postJson2  } from '@/api/common'
-import Cookies from 'js-cookie'
-import { parseTime, json2excel } from '@/utils/index.js'
-import Pagination from '@/components/Pagination'
-import { MessageBox } from 'element-ui'
-import axios from 'axios'
-import { getToken } from '@/utils/auth'
+import {
+  GetDataByName,
+  PostDataByName,
+  failproccess,
+  ExecDataByConfig,
+  GetDataByNames,
+  checkButtons,
+  postJson,
+  postJson2,
+  getSapRoute,
+} from "@/api/common";
+import Cookies from "js-cookie";
+import { parseTime, json2excel } from "@/utils/index.js";
+import Pagination from "@/components/Pagination";
+import { MessageBox } from "element-ui";
+import axios from "axios";
+import { getToken } from "@/utils/auth";
 export default {
-  name: 'MaterialRemainingRecord',
+  name: "MaterialRemainingRecord",
   components: { Pagination },
   data() {
     return {
-      pickerOptions:{
+      dateRange: [
+        parseTime(new Date(), "{y}-{m}-{d}"),
+        parseTime(new Date(), "{y}-{m}-{d}"),
+      ],
+      pickerOptionsT: {
+        // onPick: this.getPickDateT,
+        disabledDate: this.disabledDateT,
+      },
+      pickDateT: "",
+      sapUpload: {
+        dialogFormVisible: false,
+        dialogStatus: "",
+        temp: {
+          date: parseTime(new Date(), "{y}-{m}-{d}"),
+        },
+        rules: {
+          date: [{ required: true, message: "必填", trigger: "blur" }],
+        },
+        getdataListParm: {
+          name: "getSysoptEnable",
+          page: 1,
+          offset: 1,
+          pagecount: 1,
+          returntype: "Map",
+          parammaps: {
+            pastureid: Cookies.get("pastureid"),
+            inforname: "xdmysapupload",
+            date: parseTime(new Date(), "{y}-{m}-{d}"),
+          },
+        },
+        isSap: false,
+      },
+      pickerOptions: {
         disabledDate(time) {
-            return time.getTime() > Date.now() - 8.64e6;//如果没有后面的-8.64e6就是不可以选择今天的
-          }
+          return time.getTime() > Date.now() - 8.64e6; //如果没有后面的-8.64e6就是不可以选择今天的
+        },
       },
       dialogFull: false,
       isRoleEdit: [],
       getParmas: {
-          name: 'getFPList',
-          page: 1,
-          offset: 1,
+        name: "getFPList",
+        page: 1,
+        offset: 1,
+        pagecount: 0,
+        returntype: "Map",
+        parammaps: {
+          pastureid: Cookies.get("pastureid"),
+          ftname: "",
+        },
+      },
+      requestParams: [
+        {
+          name: "getBarListEnable",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid") },
+        },
+        {
+          name: "getSysoptEnable",
+          offset: 0,
           pagecount: 0,
-          returntype: 'Map',
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            ftname:"",
-          }
+            pastureid: Cookies.get("pastureid"),
+            inforname: "times",
+          },
+        },
+        {
+          name: "getTMRListEnableType",
+          offset: 0,
+          pagecount: 0,
+          parammaps: { pastureid: Cookies.get("pastureid"), eqtype: "1" },
         },
-      requestParams: [
-        { name: 'getBarListEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid') }},
-        { name: 'getSysoptEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'inforname': 'times' }},
-        { name: 'getTMRListEnableType', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'eqtype': '1' }},
-
       ],
       houseNameList: [], // 栏舍名称
       frequencyList: [], // 收集
-      recordList:[{id:'0',name:'手动记录'},{id:'1',name:'TMR设备自动记录'}],
-      record:'0',
+      recordList: [
+        { id: "0", name: "手动记录" },
+        { id: "1", name: "TMR设备自动记录" },
+      ],
+      record: "0",
       table: {
         getdataListParm: {
-          name: 'getBarfeedremainList',
+          name: "getBarfeedremainList",
           page: 1,
           offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
-          returntype: 'Map',
+          pagecount: parseInt(Cookies.get("pageCount")),
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            barid: '',
-            startTime: '',
-            stopTime: '',
-            inputDatetime: ''
-          }
+            pastureid: Cookies.get("pastureid"),
+            barid: "",
+            startTime: "",
+            stopTime: "",
+            inputDatetime: "",
+          },
         },
         tableKey: 0,
         list: [],
         total: 0,
         listLoading: true,
         temp: {},
-        tableKey2:0,
+        tableKey2: 0,
         listLoading2: false,
-        list2:[]
+        list2: [],
       },
 
       // 新增/编辑
       create: {
         dialogFormVisible: false,
-        dialogStatus: '',
-        temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'), emp: Cookies.get('employename'), barid: '', barname: '', remain: '',dry:0, times: '0',remaindate:'' },
+        dialogStatus: "",
+        temp: {
+          pastureid: Cookies.get("pastureid"),
+          operatetime: parseTime(new Date(), "{y}-{m}-{d} {h}:{i}"),
+          emp: Cookies.get("employename"),
+          barid: "",
+          barname: "",
+          remain: "",
+          dry: 0,
+          times: "0",
+          remaindate: "",
+        },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          remain: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          ftname:[{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [
+            {
+              type: "string",
+              required: true,
+              message: "必填",
+              trigger: "blur",
+            },
+          ],
+          remain: [
+            {
+              type: "string",
+              required: true,
+              message: "必填",
+              trigger: "blur",
+            },
+          ],
+          times: [
+            {
+              type: "string",
+              required: true,
+              message: "必填",
+              trigger: "blur",
+            },
+          ],
+          ftname: [
+            {
+              type: "string",
+              required: true,
+              message: "必填",
+              trigger: "blur",
+            },
+          ],
         },
         getdataListParm: {
-          name: 'getBarfeedremainEmpHis',
+          name: "getBarfeedremainEmpHis",
           page: 1,
           offset: 1,
           pagecount: 10,
-          returntype: 'Map',
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid')
-          }
+            pastureid: Cookies.get("pastureid"),
+          },
         },
-        noteTakerList: [] // 记录人
+        noteTakerList: [], // 记录人
       },
       textMap: {
-        create: '新增',
-        update: '编辑'
+        create: "新增",
+        update: "编辑",
       },
 
       requestParam: {},
       download: {
         getdataListParm: {
-          name: 'getBarfeedremainList',
+          name: "getBarfeedremainList",
           page: 1,
           offset: 1,
           pagecount: 0,
-          returntype: 'Map',
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            barid: '',
-            startTime: '',
-            stopTime: '',
-            inputDatetime: ''
-          }
+            pastureid: Cookies.get("pastureid"),
+            barid: "",
+            startTime: "",
+            stopTime: "",
+            inputDatetime: "",
+          },
         },
-        list: []
+        list: [],
       },
       dataSynchronization: {
         dialogFormVisible: false,
-        dialogStatus: '',
+        dialogStatus: "",
         getdataListParm: {
-          name: 'getSysoptEnable',
+          name: "getSysoptEnable",
           page: 1,
           offset: 1,
           pagecount: 1,
-          returntype: 'Map',
+          returntype: "Map",
           parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'wgSap'
-          }
+            pastureid: Cookies.get("pastureid"),
+            inforname: "wgSap",
+          },
         },
-        isDataSynchronization: false
+        isDataSynchronization: false,
       },
       isokDisable: false,
       selectList: [],
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      myHeight:document.documentElement.clientHeight - 85- 150 - 45,
-      url:'authdata/ImportExcel'
-    }
+      rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
+      cellStyle: { padding: 0 + "px" },
+      myHeight: document.documentElement.clientHeight - 85 - 150 - 45,
+      url: "authdata/ImportExcel",
+    };
   },
   computed: {
     // 设置请求头
     headers() {
       return {
-        token: getToken()
-      }
+        token: getToken(),
+      };
     },
     uploadData() {
       return {
-        name: 'checkbarname,checktimes,insertBarfeedremainUpload',
-        importParams: '栏舍名称,配方名称,原剩料所属时间,剩料量(kg),干物质,班次收集(一天/第一班/第二班/第三班),收集时间,操作人',
-        sheetname: 'Sheet1',
+        name: "checkbarname,checktimes,insertBarfeedremainUpload",
+        importParams:
+          "栏舍名称,配方名称,原剩料所属时间,剩料量(kg),干物质,班次收集(一天/第一班/第二班/第三班),收集时间,操作人",
+        sheetname: "Sheet1",
         // 登录牧场
-        pastureid: Cookies.get('pastureid'),
+        pastureid: Cookies.get("pastureid"),
         // 日期参数
-        dateParams: '原剩料所属时间',
+        dateParams: "原剩料所属时间",
         // 必填参数
-        requiredParams: '栏舍名称,剩料量(kg),班次收集(一天/第一班/第二班/第三班)',
+        requiredParams:
+          "栏舍名称,剩料量(kg),班次收集(一天/第一班/第二班/第三班)",
         // 为数值的参数
-        numParams: '剩料量(kg)'
-      }
+        numParams: "剩料量(kg)",
+      };
     },
     // 设置上传地址
     uploadExcelUrl() {
       // return Cookies.get('url') + 'authdata/ImportExcel'
-      return Cookies.get('url') + 'authdata/ImportExcel'
-    }
+      return Cookies.get("url") + "authdata/ImportExcel";
+    },
     // let url = 'authdata/ImportExcel';
-
   },
   created() {
-    console.log(document.querySelector("html").getAttribute("domain"),'7777')
-    this.getDataSynchronization()
-    this.getList()
-    this.getDownList()
-    this.getButtons()
+    console.log(document.querySelector("html").getAttribute("domain"), "7777");
+    this.getDataSynchronization();
+    this.getList();
+    this.getDownList();
+    this.getButtons();
+    this.getIsSap();
   },
 
   methods: {
+    disabledDateT(time) {
+      const today = new Date();
+      const oneMonthAgo = new Date();
+      oneMonthAgo.setDate(today.getDate() - 15);
+      console.log(today.getTime(), oneMonthAgo.getTime(), "选择日期----2");
+      // return time.getTime() > today.getTime() || time.getTime() < oneMonthAgo.getTime();
+      return time.getTime() > today.getTime();
+    },
+    checkDateDifference(date1, date2) {
+      const dateObj1 = new Date(date1);
+      const dateObj2 = new Date(date2);
+      const differenceInMs = Math.abs(dateObj2 - dateObj1);
+      const differenceInDays = differenceInMs / (1000 * 60 * 60 * 24);
+      if (differenceInDays > 7) {
+        this.$message.warning("日期范围相隔大于7天,请重新选择!");
+        return false;
+      } else {
+        this.dateRange = [date1, date2];
+      }
+    },
+    handleDateChange(value) {
+      console.log(value, "arr");
+      if (value.length === 2) {
+        this.checkDateDifference(value[0], value[1]);
+      }
+    },
+    sapUploadData() {
+      this.$refs["sapUpload"].validate((valid) => {
+        if (valid) {
+          const url = "authdata/xdmy/sap/leftoverEntry";
+          const data = {
+            // "name":"xdmysapupload",
+            pastureid: Cookies.get("pastureid"),
+            date: parseTime(this.sapUpload.temp.date, "{y}-{m}-{d}"),
+          };
+          postJson(url, data).then((response) => {
+            if (response.msg == "ok") {
+              this.$notify({
+                title: "",
+                message: "成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.sapUpload.dialogFormVisible = false;
+              this.getList();
+            } else {
+              this.$notify({
+                title: "失败",
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
+            }
+          });
+        }
+      });
+    },
+    getIsSap() {
+      GetDataByName(this.sapUpload.getdataListParm).then((response) => {
+        if (response.data.list !== null) {
+          if (response.data.list[0].inforvalue == 1) {
+            this.sapUpload.isSap = true;
+          } else {
+            this.sapUpload.isSap = false;
+          }
+          console.log(this.sapUpload.isSap);
+        }
+      });
+    },
+    handleSAPUpload() {
+      this.sapUpload.dialogStatus = "sapUpload";
+      this.sapUpload.dialogFormVisible = true;
+    },
+
     getDataSynchronization() {
-      GetDataByName(this.dataSynchronization.getdataListParm).then(response => {
-        // console.log(response.data.list[0])
-        if (response.data.list[0].inforvalue == 0) {
-          this.dataSynchronization.isDataSynchronization = false
-        } else {
-          this.dataSynchronization.isDataSynchronization = true
+      GetDataByName(this.dataSynchronization.getdataListParm).then(
+        (response) => {
+          // console.log(response.data.list[0])
+          if (response.data.list[0].inforvalue == 0) {
+            this.dataSynchronization.isDataSynchronization = false;
+          } else {
+            this.dataSynchronization.isDataSynchronization = true;
+          }
         }
-      })
+      );
     },
     getButtons() {
-      const Edit = 'MaterialRemainingRecord'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
+      const Edit = "MaterialRemainingRecord";
+      const isRoleEdit = checkButtons(
+        JSON.parse(sessionStorage.getItem("buttons")),
+        Edit
+      );
+      this.isRoleEdit = isRoleEdit;
     },
     getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.houseNameList = response.data.getBarListEnable.list
-        this.TMRNumberList = response.data.getTMRListEnableType.list
+      GetDataByNames(this.requestParams).then((response) => {
+        this.houseNameList = response.data.getBarListEnable.list;
+        this.TMRNumberList = response.data.getTMRListEnableType.list;
         if (response.data.getSysoptEnable.list !== null) {
-          for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
-            const obj = {}
-            obj.id = String(i)
-            if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
-            this.frequencyList.push(obj)
+          for (
+            let i = 1;
+            i <= response.data.getSysoptEnable.list[0].inforvalue;
+            i++
+          ) {
+            const obj = {};
+            obj.id = String(i);
+            if (i == 1) {
+              obj.name = "第一班";
+            } else if (i == 2) {
+              obj.name = "第二班";
+            } else if (i == 3) {
+              obj.name = "第三班";
+            } else if (i == 4) {
+              obj.name = "第四班";
+            } else if (i == 5) {
+              obj.name = "第五班";
+            } else if (i == 6) {
+              obj.name = "第六班";
+            }
+            this.frequencyList.push(obj);
           }
-          this.frequencyList.unshift({id:'0',name:"一天"})
+          this.frequencyList.unshift({ id: "0", name: "一天" });
         } else {
-          this.frequencyList = [{id:'0',name:"一天"}]
+          this.frequencyList = [{ id: "0", name: "一天" }];
         }
-      })
+      });
     },
     handleBefore() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        var start = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1
+          )
+        );
+        var stop = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1
+          )
+        );
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop);
+        this.$forceUpdate();
       }
     },
     handleNext() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        var start = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[0].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1
+          )
+        );
+        var stop = new Date(
+          this.table.getdataListParm.parammaps.inputDatetime[1].setDate(
+            this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1
+          )
+        );
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0;
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop);
+        this.$forceUpdate();
       }
     },
 
     getList() {
-      this.table.listLoading = true
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.table.listLoading = true;
+      if (
+        this.table.getdataListParm.parammaps.inputDatetime !== "" &&
+        this.table.getdataListParm.parammaps.inputDatetime !== null
+      ) {
+        this.table.getdataListParm.parammaps.startTime = parseTime(
+          this.table.getdataListParm.parammaps.inputDatetime[0],
+          "{y}-{m}-{d}"
+        );
+        this.table.getdataListParm.parammaps.stopTime = parseTime(
+          this.table.getdataListParm.parammaps.inputDatetime[1],
+          "{y}-{m}-{d}"
+        );
       } else {
-        this.table.getdataListParm.parammaps.inputDatetime = ''
-        this.table.getdataListParm.parammaps.startTime = ''
-        this.table.getdataListParm.parammaps.stopTime = ''
+        this.table.getdataListParm.parammaps.inputDatetime = "";
+        this.table.getdataListParm.parammaps.startTime = "";
+        this.table.getdataListParm.parammaps.stopTime = "";
       }
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
+      GetDataByName(this.table.getdataListParm).then((response) => {
+        console.log("table数据", response.data.list);
         if (response.data.list !== null) {
-          this.table.list = response.data.list
-          this.table.pageNum = response.data.pageNum
-          this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
+          this.table.list = response.data.list;
+          this.table.pageNum = response.data.pageNum;
+          this.table.pageSize = response.data.pageSize;
+          this.table.total = response.data.total;
         } else {
-          this.table.list = []
+          this.table.list = [];
         }
         setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+          this.table.listLoading = false;
+        }, 100);
+      });
     },
-    changeRecord(item){
-      if(item == '0'){
-        this.table.getdataListParm.name = 'getBarfeedremainList'
-      }else{
-        this.table.getdataListParm.name = 'getRemainplanrecord'
+    changeRecord(item) {
+      if (item == "0") {
+        this.table.getdataListParm.name = "getBarfeedremainList";
+      } else {
+        this.table.getdataListParm.name = "getRemainplanrecord";
       }
-      this.table.getdataListParm.offset = 1
-      this.getList()
+      this.table.getdataListParm.offset = 1;
+      this.getList();
     },
     form_search() {
-      console.log('点击了查询')
-      this.table.getdataListParm.offset = 1
-      this.getList()
+      console.log("点击了查询");
+      this.table.getdataListParm.offset = 1;
+      this.getList();
     },
     handleRefresh() {
-      console.log('点击了重置')
-      this.table.getdataListParm.parammaps.barid = ''
-      this.table.getdataListParm.parammaps.startTime = ''
-      this.table.getdataListParm.parammaps.stopTime = ''
-      this.table.getdataListParm.parammaps.inputDatetime = ''
-      this.table.getdataListParm.offset = 1
-      this.getList()
+      console.log("点击了重置");
+      this.table.getdataListParm.parammaps.barid = "";
+      this.table.getdataListParm.parammaps.startTime = "";
+      this.table.getdataListParm.parammaps.stopTime = "";
+      this.table.getdataListParm.parammaps.inputDatetime = "";
+      this.table.getdataListParm.offset = 1;
+      this.getList();
     },
 
     // 新增
     resetTemp() {
-      this.create.temp = { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'), emp: Cookies.get('employename'), barid: '', barname: '', remain: '',dry:0, times: '0',remaindate:''  }
+      this.create.temp = {
+        pastureid: Cookies.get("pastureid"),
+        operatetime: parseTime(new Date(), "{y}-{m}-{d} {h}:{i}"),
+        emp: Cookies.get("employename"),
+        barid: "",
+        barname: "",
+        remain: "",
+        dry: 0,
+        times: "0",
+        remaindate: "",
+      };
     },
     blurEmp(item) {
-      this.create.temp.emp = item.target.value
+      this.create.temp.emp = item.target.value;
     },
     // 栏舍名称
     changeBar(item) {
-      this.create.temp.barname = this.houseNameList.find(obj => obj.id === item).bname;
-      this.getParmas.parammaps.barid =  item;
+      this.create.temp.barname = this.houseNameList.find(
+        (obj) => obj.id === item
+      ).bname;
+      this.getParmas.parammaps.barid = item;
       this.chooseftname();
     },
     // 根据栏舍选择配方名称
-    chooseftname(){
-      GetDataByName(this.getParmas).then(res=>{
+    chooseftname() {
+      GetDataByName(this.getParmas).then((res) => {
         const { data } = res;
-        const ftname =data.list.length && data.list[0].ftname;
-        this.$set(this.create.temp, 'ftname', ftname)
+        const ftname = data.list.length && data.list[0].ftname;
+        this.$set(this.create.temp, "ftname", ftname);
         // this.create.temp.ftname = ftname;
-        console.log( this.create.temp.ftname,ftname, '配方名字');
-      })
+        console.log(this.create.temp.ftname, ftname, "配方名字");
+      });
     },
 
     getNoteTakerList() {
-      GetDataByName(this.create.getdataListParm).then(response => {
+      GetDataByName(this.create.getdataListParm).then((response) => {
         if (response.data.list !== null) {
           for (let i = 0; i < response.data.list.length; i++) {
-            response.data.list[i].myId = i
+            response.data.list[i].myId = i;
           }
-          this.create.noteTakerList = response.data.list
-          console.log('记录人数据', response.data.list)
-          console.log(this.create.noteTakerList)
+          this.create.noteTakerList = response.data.list;
+          console.log("记录人数据", response.data.list);
+          console.log(this.create.noteTakerList);
         } else {
-          this.create.noteTakerList = []
+          this.create.noteTakerList = [];
         }
-      })
+      });
     },
     handleCreate() {
-      console.log('点击了新增', this.create)
+      console.log("点击了新增", this.create);
 
-      this.dialogFull = false
-      this.resetTemp()
-      this.getNoteTakerList()
-      this.create.dialogStatus = 'create'
-      this.create.dialogFormVisible = true
+      this.dialogFull = false;
+      this.resetTemp();
+      this.getNoteTakerList();
+      this.create.dialogStatus = "create";
+      this.create.dialogFormVisible = true;
     },
     createData() {
-      console.log('点击了新增保存')
-      console.log(this.create.temp,'发送数据')
-      this.isokDisable = true
+      console.log("点击了新增保存");
+      console.log(this.create.temp, "发送数据");
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
+        this.isokDisable = false;
+      }, 1000);
+      this.$refs["temp"].validate((valid) => {
         if (valid) {
-          this.isokDisable = true
+          this.isokDisable = true;
           setTimeout(() => {
-            this.isokDisable = false
-          }, 1000)
-          const remain = /^\d+(\.\d{1,2})?$/
+            this.isokDisable = false;
+          }, 1000);
+          const remain = /^\d+(\.\d{1,2})?$/;
           // 剩料量
           if (!remain.test(parseFloat(this.create.temp.remain))) {
-            this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
-            return false
+            this.$message({
+              type: "error",
+              message: "剩料量请输入自然数并保留两位小数",
+              duration: 2000,
+            });
+            return false;
+          }
+          if (this.create.temp.dry) {
+            this.create.temp.dry = parseFloat(this.create.temp.dry);
+          } else {
+            this.create.temp.dry = 0;
           }
-          if(this.create.temp.dry){
-            this.create.temp.dry = parseFloat(this.create.temp.dry)
-          }else{
-            this.create.temp.dry = 0
+          this.requestParam.name = "insertBarfeedremain";
+          this.requestParam.parammaps = this.create.temp;
+          if (this.create.temp.emp == "") {
+            this.create.temp.emp = Cookies.get("employename");
           }
-          this.requestParam.name = 'insertBarfeedremain'
-          this.requestParam.parammaps = this.create.temp
-          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
-          PostDataByName(this.requestParam).then(response => {
-            console.log('新增保存发送参数', this.requestParam)
-            if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.create.dialogFormVisible = false
-              this.getList()
+          PostDataByName(this.requestParam).then((response) => {
+            console.log("新增保存发送参数", this.requestParam);
+            if (response.msg !== "fail") {
+              this.$notify({
+                title: "成功",
+                message: "保存成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.create.dialogFormVisible = false;
+              this.getList();
             } else {
-              const barid = new RegExp("key 'barid'")
+              const barid = new RegExp("key 'barid'");
               if (barid.test(response.data)) {
-                this.$message({ type: 'error', message: '该栏舍该班次收集今日剩料量已存在,不可重复生成', duration: 2000 })
+                this.$message({
+                  type: "error",
+                  message: "该栏舍该班次收集今日剩料量已存在,不可重复生成",
+                  duration: 2000,
+                });
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({
+                  title: "保存失败",
+                  message: response.data,
+                  type: "warning",
+                  duration: 2000,
+                });
               }
             }
-          })
+          });
         }
-      })
+      });
     },
     createDataAgain() {
-      console.log('点击了新增保存',this.create.temp)
-      this.isokDisable = true
+      console.log("点击了新增保存", this.create.temp);
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
+        this.isokDisable = false;
+      }, 1000);
+      this.$refs["temp"].validate((valid) => {
         if (valid) {
-          this.isokDisable = true
+          this.isokDisable = true;
           setTimeout(() => {
-            this.isokDisable = false
-          }, 1000)
-          const remain = /^\d+(\.\d{1,2})?$/
+            this.isokDisable = false;
+          }, 1000);
+          const remain = /^\d+(\.\d{1,2})?$/;
           // 剩料量
           if (!remain.test(parseFloat(this.create.temp.remain))) {
-            this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
-            return false
+            this.$message({
+              type: "error",
+              message: "剩料量请输入自然数并保留两位小数",
+              duration: 2000,
+            });
+            return false;
+          }
+          if (this.create.temp.dry) {
+            this.create.temp.dry = parseFloat(this.create.temp.dry);
+          } else {
+            this.create.temp.dry = 0;
           }
-          if(this.create.temp.dry){
-            this.create.temp.dry = parseFloat(this.create.temp.dry)
-          }else{
-            this.create.temp.dry = 0
+          this.requestParam.name = "insertBarfeedremain";
+          this.requestParam.parammaps = this.create.temp;
+          if (this.create.temp.emp == "") {
+            this.create.temp.emp = Cookies.get("employename");
           }
-          this.requestParam.name = 'insertBarfeedremain'
-          this.requestParam.parammaps = this.create.temp
-          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
-          PostDataByName(this.requestParam).then(response => {
-            console.log('新增保存发送参数', this.requestParam)
-            if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.resetTemp()
-              this.getList()
-              this.getNoteTakerList()
+          PostDataByName(this.requestParam).then((response) => {
+            console.log("新增保存发送参数", this.requestParam);
+            if (response.msg !== "fail") {
+              this.$notify({
+                title: "成功",
+                message: "保存成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.resetTemp();
+              this.getList();
+              this.getNoteTakerList();
             } else {
-              const barid = new RegExp("key 'barid'")
+              const barid = new RegExp("key 'barid'");
               if (barid.test(response.data)) {
-                this.$message({ type: 'error', message: '该栏舍该班次收集收集今日剩料量已存在,不可重复生成', duration: 2000 })
+                this.$message({
+                  type: "error",
+                  message: "该栏舍该班次收集收集今日剩料量已存在,不可重复生成",
+                  duration: 2000,
+                });
               } else {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+                this.$notify({
+                  title: "保存失败",
+                  message: response.data,
+                  type: "warning",
+                  duration: 2000,
+                });
               }
             }
-          })
+          });
         }
-      })
+      });
     },
 
     // 编辑
     handleUpdate(row) {
-      console.log('点击了编辑', row)
-      console.log(this.frequencyList,'frequencyList')
-      this.dialogFull = false
-      row.barid = String(row.barid)
-      this.create.temp = Object.assign({}, row)
-      this.create.temp.id = row.id
+      console.log("点击了编辑", row);
+      console.log(this.frequencyList, "frequencyList");
+      this.dialogFull = false;
+      row.barid = String(row.barid);
+      this.create.temp = Object.assign({}, row);
+      this.create.temp.id = row.id;
 
-      this.getNoteTakerList()
-      this.create.dialogStatus = 'update'
-      this.create.dialogFormVisible = true
+      this.getNoteTakerList();
+      this.create.dialogStatus = "update";
+      this.create.dialogFormVisible = true;
     },
     updateData() {
-      this.isokDisable = true
+      this.isokDisable = true;
       setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.$refs['temp'].validate(valid => {
+        this.isokDisable = false;
+      }, 1000);
+      this.$refs["temp"].validate((valid) => {
         if (valid) {
-          this.isokDisable = true
+          this.isokDisable = true;
           setTimeout(() => {
-            this.isokDisable = false
-          }, 1000)
-          const remain = /^\d+(\.\d{1,2})?$/
+            this.isokDisable = false;
+          }, 1000);
+          const remain = /^\d+(\.\d{1,2})?$/;
           // 剩料量
           if (!remain.test(parseFloat(this.create.temp.remain))) {
-            this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
-            return false
+            this.$message({
+              type: "error",
+              message: "剩料量请输入自然数并保留两位小数",
+              duration: 2000,
+            });
+            return false;
           }
 
-          this.requestParam.name = 'updateBarfeedremain'
-          if(this.create.temp.dry){
-            this.create.temp.dry = parseFloat(this.create.temp.dry)
-          }else{
-            this.create.temp.dry = 0
+          this.requestParam.name = "updateBarfeedremain";
+          if (this.create.temp.dry) {
+            this.create.temp.dry = parseFloat(this.create.temp.dry);
+          } else {
+            this.create.temp.dry = 0;
           }
-          this.requestParam.parammaps = this.create.temp
-          if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
-          PostDataByName(this.requestParam).then(response => {
-            console.log('新增保存发送参数', this.requestParam)
-            if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.create.dialogFormVisible = false
-              this.getList()
+          this.requestParam.parammaps = this.create.temp;
+          if (this.create.temp.emp == "") {
+            this.create.temp.emp = Cookies.get("employename");
+          }
+          PostDataByName(this.requestParam).then((response) => {
+            console.log("新增保存发送参数", this.requestParam);
+            if (response.msg !== "fail") {
+              this.$notify({
+                title: "成功",
+                message: "保存成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.create.dialogFormVisible = false;
+              this.getList();
             } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({
+                title: "保存失败",
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
             }
-          })
+          });
         }
-      })
+      });
     },
 
     // 删除
     handleRowDelete(row) {
-      console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        this.selectList = []
-        this.requestParam.name = 'deleteBarfeedremain'
-        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: '已取消删除' })
+      console.log("点击了行内删除");
+      MessageBox.confirm("是否确认删除此信息?", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "warning",
       })
+        .then(() => {
+          this.selectList = [];
+          this.requestParam.name = "deleteBarfeedremain";
+          this.requestParam.parammaps = {};
+          this.requestParam.parammaps.pastureid = row.pastureid;
+          this.requestParam.parammaps.id = row.id;
+          PostDataByName(this.requestParam).then((response) => {
+            if (response.msg === "fail") {
+              this.$notify({
+                title: "删除失败",
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
+            }
+          });
+        })
+        .catch(() => {
+          this.$message({ type: "info", message: "已取消删除" });
+        });
     },
     handleSelectionChange(val) {
-      console.log('勾选数据', val)
-      this.selectList = val
+      console.log("勾选数据", val);
+      this.selectList = val;
     },
     form_delete() {
-      console.log('点击了删除')
+      console.log("点击了删除");
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
+        this.$message({
+          type: "error",
+          message: "请选择栏舍剩料记录",
+          duration: 2000,
+        });
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          console.log(this.selectList)
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'deleteBarfeedremain', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid'
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('删除保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+        MessageBox.confirm(
+          "当前选中" + this.selectList.length + "条信息,是否删除?",
+          {
+            confirmButtonText: "确认",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).then(() => {
+          console.log(this.selectList);
+          this.requestParam.common = { returnmap: "0" };
+          this.requestParam.data = [];
+          this.requestParam.data[0] = {
+            name: "insertSpotList",
+            resultmaps: { list: this.selectList },
+          };
+          this.requestParam.data[0].children = [];
+          this.requestParam.data[0].children[0] = {
+            name: "deleteBarfeedremain",
+            type: "e",
+            parammaps: {
+              id: "@insertSpotList.id",
+              pastureid: "@insertSpotList.pastureid",
+            },
+          };
+          ExecDataByConfig(this.requestParam).then((response) => {
+            console.log("删除保存发送参数", this.requestParam);
+            if (response.msg === "fail") {
+              this.$notify({
+                title: "删除失败",
+                message: response.data,
+                type: "warning",
+                duration: 2000,
+              });
             } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
-              this.getList()
+              this.$notify({
+                title: "",
+                message: "删除成功",
+                type: "success",
+                duration: 2000,
+              });
+              this.getList();
             }
-          })
-        })
+          });
+        });
       }
     },
     // 复制
     handleCopy() {
-      console.log('点击了复制')
+      console.log("点击了复制");
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
+        this.$message({
+          type: "error",
+          message: "请选择栏舍剩料记录",
+          duration: 2000,
+        });
       } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.requestParam.name = 'copybarfeedremain'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
-          this.requestParam.parammaps.id = this.selectList[0].id
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              const barid = new RegExp("key 'barid'")
-              if (barid.test(response.data)) {
-                this.$notify({ type: 'warning', message: '该栏舍该班次收集今日剩料量已存在,不可重复生成', duration: 2000 })
-                return
+        MessageBox.confirm("是否确认复制此信息?", {
+          confirmButtonText: "确认",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            this.requestParam.name = "copybarfeedremain";
+            this.requestParam.parammaps = {};
+            this.requestParam.parammaps.pastureid =
+              this.selectList[0].pastureid;
+            this.requestParam.parammaps.id = this.selectList[0].id;
+            PostDataByName(this.requestParam).then((response) => {
+              if (response.msg === "fail") {
+                const barid = new RegExp("key 'barid'");
+                if (barid.test(response.data)) {
+                  this.$notify({
+                    type: "warning",
+                    message: "该栏舍该班次收集今日剩料量已存在,不可重复生成",
+                    duration: 2000,
+                  });
+                  return;
+                }
+                this.$notify({
+                  title: "保存失败",
+                  message: response.data,
+                  type: "warning",
+                  duration: 2000,
+                });
+              } else {
+                this.$notify({
+                  title: "成功",
+                  message: "保存成功",
+                  type: "success",
+                  duration: 2000,
+                });
+                this.getList();
               }
-              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: '已取消复制' })
-        })
+          .catch(() => {
+            this.$message({ type: "info", message: "已取消复制" });
+          });
       } else {
-        this.$message({ type: 'error', message: '请选择一条栏舍剩料记录', duration: 2000 })
+        this.$message({
+          type: "error",
+          message: "请选择一条栏舍剩料记录",
+          duration: 2000,
+        });
       }
     },
     // 导出
     handleExport(item) {
       if (item == 1) {
-        console.log('点击了导出模板')
-        console.log('点击了导出模板')
-        const requestParam = this.requestParam
-        const url = Cookies.get('url') + 'authdata/barfeedremain/excel' // 请求下载文件的地址
-        console.log(url)
+        console.log("点击了导出模板");
+        console.log("点击了导出模板");
+        const requestParam = this.requestParam;
+        const url = Cookies.get("url") + "authdata/barfeedremain/excel"; // 请求下载文件的地址
+        console.log(url);
         axios({
-          method: 'POST',
+          method: "POST",
           url: url,
           data: requestParam,
-          headers: { token: getToken(), optname: 'insertcustomdoc' },
-          responseType: 'blob'
-        }).then(res => {
-          if (!res) return
-          this.percentage = 99
+          headers: { token: getToken(), optname: "insertcustomdoc" },
+          responseType: "blob",
+        }).then((res) => {
+          if (!res) return;
+          this.percentage = 99;
           setTimeout(() => {
-            this.isPercentage = false
-          }, 2000)
+            this.isPercentage = false;
+          }, 2000);
           const blob = new Blob([res.data], {
-            type: 'application/octet-stream;charset=utf-8'
-          })
-          const url = window.URL.createObjectURL(blob)
-          const aLink = document.createElement('a')
-          aLink.style.display = 'none'
-          aLink.href = url
-          const docname = '栏舍剩料记录导入模板.xlsx'
-          aLink.setAttribute('download', docname) // 下载的文件
-          document.body.appendChild(aLink)
-          aLink.click()
-          document.body.removeChild(aLink)
-          window.URL.revokeObjectURL(url)
-        })
+            type: "application/octet-stream;charset=utf-8",
+          });
+          const url = window.URL.createObjectURL(blob);
+          const aLink = document.createElement("a");
+          aLink.style.display = "none";
+          aLink.href = url;
+          const docname = "栏舍剩料记录导入模板.xlsx";
+          aLink.setAttribute("download", docname); // 下载的文件
+          document.body.appendChild(aLink);
+          aLink.click();
+          document.body.removeChild(aLink);
+          window.URL.revokeObjectURL(url);
+        });
       } else {
-        console.log('点击了导出数据',item,this.record)
-        if(this.record == '0'){
-          this.download.getdataListParm.name = 'getBarfeedremainList'
-        }else{
-          this.download.getdataListParm.name = 'getRemainplanrecord'
+        console.log("点击了导出数据", item, this.record);
+        if (this.record == "0") {
+          this.download.getdataListParm.name = "getBarfeedremainList";
+        } else {
+          this.download.getdataListParm.name = "getRemainplanrecord";
         }
-        this.download.getdataListParm.parammaps = this.table.getdataListParm.parammaps
-        if (this.download.getdataListParm.parammaps.inputDatetime !== '' && this.download.getdataListParm.parammaps.inputDatetime !== null) {
-          this.download.getdataListParm.parammaps.startTime = parseTime(this.download.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-          this.download.getdataListParm.parammaps.stopTime = parseTime(this.download.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+        this.download.getdataListParm.parammaps =
+          this.table.getdataListParm.parammaps;
+        if (
+          this.download.getdataListParm.parammaps.inputDatetime !== "" &&
+          this.download.getdataListParm.parammaps.inputDatetime !== null
+        ) {
+          this.download.getdataListParm.parammaps.startTime = parseTime(
+            this.download.getdataListParm.parammaps.inputDatetime[0],
+            "{y}-{m}-{d}"
+          );
+          this.download.getdataListParm.parammaps.stopTime = parseTime(
+            this.download.getdataListParm.parammaps.inputDatetime[1],
+            "{y}-{m}-{d}"
+          );
         } else {
-          this.download.getdataListParm.parammaps.inputDatetime = ''
-          this.download.getdataListParm.parammaps.startTime = ''
-          this.download.getdataListParm.parammaps.stopTime = ''
+          this.download.getdataListParm.parammaps.inputDatetime = "";
+          this.download.getdataListParm.parammaps.startTime = "";
+          this.download.getdataListParm.parammaps.stopTime = "";
         }
-        GetDataByName(this.download.getdataListParm).then(response => {
+        GetDataByName(this.download.getdataListParm).then((response) => {
           if (response.data.list !== null) {
-            this.download.list = response.data.list
+            this.download.list = response.data.list;
           } else {
-            this.download.list = []
+            this.download.list = [];
           }
-           if(item== 2){
-              var excelDatas1 = [
-                {
-                  tHeader: ['栏舍名称','配方名称','原剩料所属时间', '剩料量(kg)','干物质', '班次(收集)', '收集时间', '操作人'],
-                  filterVal: ['barname', 'ftname','remaindate','remain','dry', 'timesstr', 'operatetime', 'emp'],
-                  tableDatas: this.download.list,
-                  sheetName: 'Sheet1'
-                }
-              ]
-              json2excel(excelDatas1, '栏舍剩料记录-手动记录', true, 'xlsx')
-           }else{
-             var excelDatas2 = [
-               {
-                 tHeader: ['TMR设备编号','TMR设备名称','TMR设备类型','栏舍名称','收集时间','剩料重量(kg)','开始重量(kg)','结束重量(kg)','驾驶员'],
-                 filterVal: ['eqcode','eqname','tclassname','barname','createtime','weight','beginweight','endweight','driver'],
-                 tableDatas: this.download.list,
-                 sheetName: 'Sheet1'
-               }
-             ]
-             json2excel(excelDatas2, '栏舍剩料记录-TMR设备自动记录', true, 'xlsx')
-           }
-        })
+          if (item == 2) {
+            var excelDatas1 = [
+              {
+                tHeader: [
+                  "栏舍名称",
+                  "配方名称",
+                  "原剩料所属时间",
+                  "剩料量(kg)",
+                  "干物质",
+                  "班次(收集)",
+                  "收集时间",
+                  "操作人",
+                ],
+                filterVal: [
+                  "barname",
+                  "ftname",
+                  "remaindate",
+                  "remain",
+                  "dry",
+                  "timesstr",
+                  "operatetime",
+                  "emp",
+                ],
+                tableDatas: this.download.list,
+                sheetName: "Sheet1",
+              },
+            ];
+            json2excel(excelDatas1, "栏舍剩料记录-手动记录", true, "xlsx");
+          } else {
+            var excelDatas2 = [
+              {
+                tHeader: [
+                  "TMR设备编号",
+                  "TMR设备名称",
+                  "TMR设备类型",
+                  "栏舍名称",
+                  "收集时间",
+                  "剩料重量(kg)",
+                  "开始重量(kg)",
+                  "结束重量(kg)",
+                  "驾驶员",
+                ],
+                filterVal: [
+                  "eqcode",
+                  "eqname",
+                  "tclassname",
+                  "barname",
+                  "createtime",
+                  "weight",
+                  "beginweight",
+                  "endweight",
+                  "driver",
+                ],
+                tableDatas: this.download.list,
+                sheetName: "Sheet1",
+              },
+            ];
+            json2excel(
+              excelDatas2,
+              "栏舍剩料记录-TMR设备自动记录",
+              true,
+              "xlsx"
+            );
+          }
+        });
       }
     },
 
     beforeImport(file) {
-      const isLt2M = file.size / 1024 / 1024 < 2
+      const isLt2M = file.size / 1024 / 1024 < 2;
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error("上传文件大小不能超过 2MB!");
       }
-      return isLt2M
+      return isLt2M;
     },
     handleImportSuccess(res, file) {
-      this.getList()
-      if (res.msg === 'ok') {
-        this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+      this.getList();
+      if (res.msg === "ok") {
+        this.$message({
+          title: "成功",
+          message: "导入成功:" + res.data.success + "条!",
+          type: "success",
+          duration: 2000,
+        });
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
-           import('@/vendor/Export2Excel').then(excel => {
-             const list1 = res.data.result
-             const tHeader = ['栏舍名称', '配方名称','原剩料所属时间','剩料量(kg)','干物质', '班次(收集)', '收集时间', '操作人', '错误信息']
-             const filterVal = ['栏舍名称', '配方名称','原剩料所属时间','剩料量(kg)','干物质', '班次(收集)', '收集时间', '操作人', 'error_msg']
-             const data1 = this.formatJson(filterVal, list1)
-             excel.export_json_to_excel({ header: tHeader, data: data1, filename: '栏舍剩料记录导入报错信息', autoWidth: true, bookType: 'xlsx' })
-           })
+          this.$notify({
+            title: "失败",
+            message: "导入失败:" + res.data.err_count + "条!",
+            type: "danger",
+            duration: 2000,
+          });
+          import("@/vendor/Export2Excel").then((excel) => {
+            const list1 = res.data.result;
+            const tHeader = [
+              "栏舍名称",
+              "配方名称",
+              "原剩料所属时间",
+              "剩料量(kg)",
+              "干物质",
+              "班次(收集)",
+              "收集时间",
+              "操作人",
+              "错误信息",
+            ];
+            const filterVal = [
+              "栏舍名称",
+              "配方名称",
+              "原剩料所属时间",
+              "剩料量(kg)",
+              "干物质",
+              "班次(收集)",
+              "收集时间",
+              "操作人",
+              "error_msg",
+            ];
+            const data1 = this.formatJson(filterVal, list1);
+            excel.export_json_to_excel({
+              header: tHeader,
+              data: data1,
+              filename: "栏舍剩料记录导入报错信息",
+              autoWidth: true,
+              bookType: "xlsx",
+            });
+          });
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({
+          title: "失败",
+          message: "上传失败",
+          type: "danger",
+          duration: 2000,
+        });
       }
     },
     formatJson(filterVal, jsonData) {
-      return jsonData.map(v =>
-        filterVal.map(j => {
-          if (j === 'timestamp') {
-            return parseTime(v[j])
+      return jsonData.map((v) =>
+        filterVal.map((j) => {
+          if (j === "timestamp") {
+            return parseTime(v[j]);
           } else {
-            return v[j]
+            return v[j];
           }
         })
-      )
-    },
-    handleDataUpload(){
-      let a = Cookies.get('url')
-      let b = a.search(8081)
-      let c = a.substring(0,a.search(8081)) + '8082'
-      let d = a.substring(0,a.lastIndexOf('/'))
-      console.log(d)
-      let url = ''
-      if(b == -1){
-        url = d + ':8082'
-      }else{
-        url = c
+      );
+    },
+    handleDataUpload() {
+      let a = Cookies.get("url");
+      let b = a.search(8081);
+      let c = a.substring(0, a.search(8081)) + "8082";
+      let d = a.substring(0, a.lastIndexOf("/"));
+      console.log(d);
+      let url = "";
+      if (b == -1) {
+        url = d + ":8082";
+      } else {
+        url = c;
       }
-      console.log(url,'url')
-      let _url = url + '/authdata/surplus/push'
+      console.log(url, "url");
+      let _url = url + "/authdata/surplus/push";
       let data = {
-        date:parseTime(new Date(), '{y}-{m}-{d}'),
-        pastureId:Cookies.get('pastureid')
-      }
-      console.log(_url,'_url')
-      postJson2(_url, data).then(response => {
-        if(response.msg == 'ok'){
-          this.$notify({ title: '', message: response.data, type: 'success', duration: 2000 })
-        }else{
-          this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
+        date: parseTime(new Date(), "{y}-{m}-{d}"),
+        pastureId: Cookies.get("pastureid"),
+      };
+      console.log(_url, "_url");
+      postJson2(_url, data).then((response) => {
+        if (response.msg == "ok") {
+          this.$notify({
+            title: "",
+            message: response.data,
+            type: "success",
+            duration: 2000,
+          });
+        } else {
+          this.$notify({
+            title: "上传失败",
+            message: response.data,
+            type: "warning",
+            duration: 2000,
+          });
         }
-      })
-    }
-  }
-}
+      });
+    },
+  },
+};
 </script>

Некоторые файлы не были показаны из-за большого количества измененных файлов