Browse Source

更新8-13,此次更新对基础信息下舍组栏添加了“牛舍类型及牛群”字段,饲料表添加了“饲料组”字段,仅供现代牧业使用

duanxiaoduan 2 years ago
parent
commit
790c7a4342

+ 2 - 2
.env.development

@@ -3,10 +3,10 @@ ENV = 'development'
 
 # base api
 # 测试线
-VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
+# VUE_APP_BASE_API = 'http://210.16.189.72:8081/'
 
 
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 
 # VUE_APP_BASE_API = 'http://tmrwatch.cn/'
 

BIN
dist.zip


+ 10 - 13
src/views/basicData/groupColumn/index.vue

@@ -355,6 +355,7 @@ export default {
         this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
         return false
       }
+	  // 现代牧业专用
       // if (this.table.temp.bcode.length > 8) {
       //   this.$message({ type: 'error', message: '栏舍编号请输入1-8位数字', duration: 2000 })
       //   return false
@@ -481,19 +482,15 @@ export default {
         return false
       }
       // 现代牧业专用
-      if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: '栏舍名称/栏舍编号/牛舍类型/牛群不能为空', duration: 2000 })
-        return false
-      }else if (this.table.temp.bname == '') {
-        this.$message({ type: 'error', message: '栏舍名称不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.bcode == '') {
-        this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
-        return false
-      }
-      // if (this.table.temp.bcode.length > 8) {
-      //   this.$message({ type: 'error', message: '栏舍编号请输入1-8位数字', duration: 2000 })
-      //   return false
+      // if (this.table.temp.bname == '' && this.table.temp.bcode == '') {
+      //   this.$message({ type: 'error', message: '栏舍名称/栏舍编号/牛舍类型/牛群不能为空', duration: 2000 })
+      //   return false
+      // }else if (this.table.temp.bname == '') {
+      //   this.$message({ type: 'error', message: '栏舍名称不能为空', duration: 2000 })
+      //   return false
+      // } else if (this.table.temp.bcode == '') {
+      //   this.$message({ type: 'error', message: '栏舍编号不能为空', duration: 2000 })
+      //   return false
       // }
       if (this.table.temp.allowratio !== '') {
         console.log(this.table.temp.allowratio)

+ 2 - 1
src/views/formulationPlan/formulaDistribution/index.vue

@@ -504,7 +504,8 @@ export default {
           pastureid: '@insertSpotList2.id',
           groupsid: Cookies.get('pastureid')
         }}
-        ExecDataByConfig(this.requestParam).then(response => {
+        let url = "authdata/formulaissued"
+        postJson(url,this.requestParam).then(response => {
           console.log('配方下发保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
             this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })

+ 2 - 1
src/views/formulationPlan/formulaDistribution/inde改.vue

@@ -522,7 +522,8 @@ export default {
           pastureid: '@insertSpotList2.id',
           groupsid: Cookies.get('pastureid')
         }}
-        ExecDataByConfig(this.requestParam).then(response => {
+        let url = "authdata/formulaissued"
+        postJson(url,this.requestParam).then(response => {
           console.log('配方下发保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
             this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })