羊圈修改牧场&固定式优化&隐藏字段

.env.development

@@ -4,9 +4,9 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
+# VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
 
 # 许义平后台本地
 # VUE_APP_BASE_API = 'http://192.168.1.96:8081/'

src/views/basicData/defaultParameter/function/index.vue

@@ -135,11 +135,11 @@
             <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
           </el-form-item>
         </el-col> -->
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="任意车数量:" prop="anyCar">
             <el-input ref="anyCar" v-model="createTemp.anyCar" :disabled="isRoleEdit==false" class="filter-item" placeholder="任意车数量" type="text" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="混料准确率:" prop="accuracy">
               <el-select v-model="createTemp.accuracy" :disabled="isRoleEdit==false" filterable placeholder="混料准确率" class="filter-item" style="width:100%">
@@ -309,9 +309,9 @@ export default {
       setTimeout(() => {
         this.isokDisable = false
       }, 1000)
-      if(this.createTemp.anyCar == '' || this.createTemp.anyCar == 0){
-        this.$message({ type: 'error', message: '任意车数量不能为空或为0', duration: 2000 })
-      }
+      // if(this.createTemp.anyCar == '' || this.createTemp.anyCar == 0){
+      //   this.$message({ type: 'error', message: '任意车数量不能为空或为0', duration: 2000 })
+      // }
       this.requestParam.common = { 'returnmap': '0' }
       this.requestParam.data = []
       this.requestParam.data[0] = { 'name': 'updatesysopt', 'type': 'e', 'parammaps': {

src/views/basicData/defaultParameter/index2.vue

@@ -1,282 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="250px" style="margin-top: 40px;margin-bottom:30px;">
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="是否可取前一天计划：" prop="isGetLastPlan">
-            <el-select v-model="createTemp.isGetLastPlan" :disabled="isRoleEdit==false" filterable placeholder="是否可取前一天计划" class="filter-item" style="width:100%">
-              <el-option v-for="item in planBeforeDayList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否可取后一天计划：" prop="isGetNextPlan">
-            <el-select v-model="createTemp.isGetNextPlan" :disabled="isRoleEdit==false" filterable placeholder="是否可取后一天计划" class="filter-item" style="width:100%">
-              <el-option v-for="item in planNextDayList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="是否启用补料：" prop="isEnableSupplyFeed">
-            <el-select v-model="createTemp.isEnableSupplyFeed" :disabled="isRoleEdit==false" filterable placeholder="是否启用补料" class="filter-item" style="width:100%">
-              <el-option v-for="item in isSupplementList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否启用剩料：" prop="isEnableRemainFeed">
-            <el-select v-model="createTemp.isEnableRemainFeed" :disabled="isRoleEdit==false" filterable placeholder="是否启用剩料" class="filter-item" style="width:100%">
-              <el-option v-for="item in isLeftoverMaterialList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="日计划报表小数点位数：" prop="reportDigit">
-            <el-select v-model="createTemp.reportDigit" :disabled="isRoleEdit==false" filterable placeholder="日计划报表小数点位数" class="filter-item" style="width:100%">
-              <el-option v-for="item in decimalPlacesList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="启用饲料锁定牛头数：" prop="isLockCount">
-            <el-select v-model="createTemp.isLockCount" :disabled="isRoleEdit==false" filterable placeholder="启用饲料锁定牛头数" class="filter-item" style="width:100%">
-              <el-option v-for="item in isLockBullsList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="剩料处理选项：" prop="remainOpt">
-            <el-select v-model="createTemp.remainOpt" :disabled="isRoleEdit==false" filterable placeholder="剩料处理选项" class="filter-item" style="width:100%">
-              <el-option v-for="item in disposalList" :key="item.id" :label="item.fname" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="水分调节选项：" prop="waterOpt">
-            <el-select v-model="createTemp.waterOpt" :disabled="isRoleEdit==false" filterable placeholder="水分调节选项" class="filter-item" style="width:100%">
-              <el-option v-for="item in waterConditioningList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="默认撒料超出重量提醒比例：" prop="overweightWarnRate">
-            <el-input ref="overweightWarnRate" v-model="createTemp.overweightWarnRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入超出比例" type="text" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="默认撒料超出重量禁止比例：" prop="overweightBanRate">
-            <el-input ref="overweightBanRate" v-model="createTemp.overweightBanRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入禁止比例" type="text" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="库存预警天数：" prop="repertoryWarn">
-            <el-input ref="repertoryWarn" v-model="createTemp.repertoryWarn" :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入库存预警天数" type="text" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否启用库存管理：" prop="isfeedstorage">
-            <el-select v-model="createTemp.isfeedstorage" :disabled="isRoleEdit==false" filterable placeholder="水分调节选项" class="filter-item" style="width:100%">
-              <el-option v-for="item in priceCalculationList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="班次数量：" prop="times">
-            <el-select v-model="createTemp.times" :disabled="isRoleEdit==false" filterable placeholder="水分调节选项" class="filter-item" style="width:100%">
-              <el-option v-for="item in numberList" :key="item.id" :label="item.name" :value="item.name" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="是否启用饲料合同：" prop="isEnableContract">
-            <el-select v-model="createTemp.isEnableContract" :disabled="isRoleEdit==false" filterable placeholder="启用饲料合同" class="filter-item" style="width:100%">
-              <el-option v-for="item in feedontractList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="12">
-          <el-form-item label="剩料分配方式：" prop="remainOptDis">
-            <el-select v-model="createTemp.remainOptDis" :disabled="isRoleEdit==false" filterable placeholder="剩料分配方式" class="filter-item" style="width:100%">
-              <el-option v-for="item in leftoverMaterialList" :key="item.id" :label="item.name" :value="item.name" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12">
-          <el-form-item label="剩料分配占比原混料(%)：" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-    </el-form>
-    <div slot="footer" class="dialog-footer" style="bottom: 0;">
-      <el-button v-if="isRoleEdit" class="success" :disabled="isokDisable" @click="handleSave">保存</el-button>
-      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery">恢复默认</el-button>
-    </div>
-  </div>
-
-</template>
-
-<script>
-import { GetDataByName, PostDataByName, GetDataByNames, failproccess, checkButtons, ExecDataByConfig } from '@/api/common'
-import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'DefaultParameter',
-  data() {
-    return {
-      isRoleEdit: [],
-      planBeforeDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取前一天计划
-      planNextDayList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否可取后一天计划
-      isSupplementList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用补料
-      isLeftoverMaterialList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用剩料
-      decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
-      isLockBullsList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 启用饲料锁定牛头数
-      disposalList: [], // 剩料处理选项
-      waterConditioningList: [{ id: '0', name: '青贮' }, { id: '1', name: '总日粮饲喂量' }, { id: '2', name: '不处理' }], // 水分调节选项
-      priceCalculationList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用库存管理
-      numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
-      feedontractList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否启用饲料合同
-      leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '平均分配' }],
-      requestParams: [
-        { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
-      ],
-      getdataListParm: {
-        name: 'getysoptList',
-        page: 1,
-        offset: 1,
-        pagecount: 10,
-        returntype: 'Map',
-        parammaps: {
-          pastureid: Cookies.get('pastureid')
-        }
-      },
-      tableKey: 0,
-      listLoading: true,
-      createTemp: {},
-      rules: {},
-      isokDisable: false,
-      requestParam: {}
-
-    }
-  },
-  created() {
-    this.getList()
-    this.getButtons()
-    this.getDownList()
-  },
-
-  methods: {
-    getButtons() {
-      const Edit = 'DefaultParameter'
-      const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
-      this.isRoleEdit = isRoleEdit
-    },
-    getDownList() {
-      GetDataByNames(this.requestParams).then(response => {
-        this.disposalList = response.data.getRemainFeedList.list
-      })
-    },
-    getList() {
-      this.listLoading = true
-      GetDataByName(this.getdataListParm).then(response => {
-        console.log('table1数据', response.data.list)
-        if (response.data.list !== null) {
-          this.createTemp = response.data.list[0]
-        } else {
-          this.list = []
-        }
-        setTimeout(() => {
-          this.listLoading = false
-        }, 100)
-      })
-    },
-    handleSave() {
-      console.log('点击了保存')
-      this.isokDisable = true
-      setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'updatesysopt', 'type': 'e', 'parammaps': {
-        pastureid: this.createTemp.pastureid,
-        isGetLastPlan: this.createTemp.isGetLastPlan,
-        isGetNextPlan: this.createTemp.isGetNextPlan,
-        isEnableSupplyFeed: this.createTemp.isEnableSupplyFeed,
-        isEnableRemainFeed: this.createTemp.isEnableRemainFeed,
-        reportDigit: this.createTemp.reportDigit,
-        isLockCount: this.createTemp.isLockCount,
-        remainOpt: this.createTemp.remainOpt,
-        waterOpt: this.createTemp.waterOpt,
-        overweightWarnRate: this.createTemp.overweightWarnRate,
-        overweightBanRate: this.createTemp.overweightBanRate,
-        repertoryWarn: this.createTemp.repertoryWarn,
-        isfeedstorage: this.createTemp.isfeedstorage,
-        times: this.createTemp.times,
-        isEnableContract: this.createTemp.isEnableContract,
-        remainOptDis: this.createTemp.remainOptDis,
-        remainOptRate: this.createTemp.remainOptRate
-      }}
-      this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
-        pastureid: this.createTemp.pastureid
-      }}
-
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('保存发送参数', this.requestParam)
-        if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-          this.getList()
-        } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-        }
-      })
-    },
-    handleRecovery() {
-      console.log('点击了恢复默认')
-      this.isokDisable = true
-      setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        this.requestParam.common = { 'returnmap': '0' }
-        this.requestParam.data = []
-        this.requestParam.data[0] = { 'name': 'updatesysoptinit', 'type': 'e', 'parammaps': {
-          pastureid: this.createTemp.pastureid
-        }}
-        this.requestParam.data[1] = { 'name': 'updateFPbyFTChangeALL', 'type': 'e', 'parammaps': {
-          pastureid: this.createTemp.pastureid
-        }}
-
-        ExecDataByConfig(this.requestParam).then(response => {
-          console.log('保存发送参数', this.requestParam)
-          if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-            this.getList()
-          } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-          }
-        })
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-
-</style>

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -1603,14 +1603,14 @@ export default {
 
     // 日执行计划行点击
     tableRowClick(row, column, event) {
-      console.log(row, column, event)
+      console.log(row,'hss')
       console.log('点击计划类型', row.lpplantype)
       if (this.isOrder == false) {
         this.$message({ type: 'error', message: '请保存或取消当前更改顺序操作', duration: 2000 })
       } else {
         if (column.label !== '操作') {
           this.isDetail = true // 点击行显示详情
-          this.myheight = document.documentElement.clientHeight - 85 - 265 - 230
+          this.myheight = document.documentElement.clientHeight - 85 - 265 - 100
         }
       }
       this.table2.getdataListParm.parammaps.havebutton = row.havebutton
@@ -1643,7 +1643,8 @@ export default {
         this.table2.getdataListParm.parammaps.id = row.id
         this.table3.getdataListParm.parammaps.id = row.id
         this.table3.getdataListParm.parammaps.lpplantype = row.lpplantype
-        // this.getList2() // 如果是固定式则不调用 getDownloadplandtl1ListV2的接口
+        this.table2.getdataListParm.parammaps.lpplantype = row.lpplantype
+        this.getList2()
         this.getList3()
       } else if (row.lpplantype == 2) {
         // 撒料计划-撒料
@@ -1661,7 +1662,7 @@ export default {
         this.table2.getdataListParm.parammaps.lpplantype = row.lpplantype
         this.getList2()
         this.getList3()
-        console.log(this.table3.getdataListParm.parammaps.lpplantype)
+
       } else if (row.lpplantype == 3) {
         // 剩料
         this.table2.getdataListParm.name = 'getDownloadplandt2ListV2'
@@ -1706,7 +1707,6 @@ export default {
     },
     // 计划内容操作详情
     getList2() {
-      console.log(this.table2.getdataListParm.parammaps.lpplantype,'lpplantype===')
       if(this.table2.getdataListParm.parammaps.lpplantype == 2){
         const url = 'new_api/user/gear'
         const data = {

src/views/systemManagement/ranchInformation/index.vue

@@ -51,7 +51,7 @@
             <span>{{ scope.row.groupsname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="牧场名称" min-width="130px" align="center">
+        <el-table-column label="羊场" min-width="130px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.pastureName }}</span>
           </template>
@@ -274,7 +274,7 @@ export default {
 </script>
 <style lang="scss" scoped>
   .search{margin-top:10px;}
-  
+
   $width:350px;
   $left:325px;
   .selectInput{