修改了配方模板的系统bug

.env.development

@@ -3,9 +3,9 @@ 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://192.168.1.56:8081/'

src/views/formulationPlan/recipeTemplate/index.vue

@@ -13,6 +13,9 @@
           <el-select v-model="table.getdataListParm.parammaps.fttype" filterable placeholder="配方类型" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in formulaTypeList" :key="item.value" :label="item.label" :value="item.label" />
           </el-select>
+          <el-select v-model="table.getdataListParm.parammaps.source" filterable placeholder="来源" class="filter-item" style="width: 120px;" clearable>
+            <el-option v-for="item in sourceList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
           <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
@@ -23,7 +26,8 @@
             <ul v-if="arrowUp" class="selectUl">
               <li><a>配方名称</a><el-input v-model="table.getdataListParm.parammaps.tname" clearable style="width: 245px;" /></li>
               <li><a>备注</a><el-input v-model="table.getdataListParm.parammaps.remark" clearable style="width: 245px;" /></li>
-              <li><a>来源</a><el-input v-model="table.getdataListParm.parammaps.source" clearable style="width: 245px;" /></li>
+              <li />
+              <!-- <li><a>来源</a><el-input v-model="table.getdataListParm.parammaps.source" clearable style="width: 245px;" /></li> -->
               <li>
                 <div style="float: right;">
                   <el-button class="downminCancel" @click="arrowUp=false;arrowDown=true;">取消</el-button>
@@ -809,7 +813,7 @@ export default {
         '#E57373', '#F06292', '#BA68C8', '#9575CD', '#7986CB', '#64B5F6', '#4FC3F7', '#4DD0E1', '#4DB6AC', '#81C784', '#AED581', '#DCE775', '#FFF176', '#FFD54F', '#FFB74D', '#FF8A65', '#A1887F', '#E0E0E0', '#90A4AE'
       ],
       isRoleEdit: [],
-      myheight: '',
+      myheight: document.documentElement.clientHeight - 265,
       requestParams: [
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['牲畜父类'] },
         { name: 'getDictByName2', offset: 0, pagecount: 0, params: ['配方类型'] },
@@ -822,8 +826,6 @@ export default {
       feedNameList: [], // 饲料名称
       mixingDelayList: [{ id: '0', name: '0' }, { id: '1', name: '1' }, { id: '2', name: '2' }, { id: '3', name: '3' }, { id: '4', name: '4' }, { id: '5', name: '5' }, { id: '6', name: '6' }, { id: '7', name: '7' }, { id: '8', name: '8' }, { id: '9', name: '9' }, { id: '10', name: '10' }, { id: '11', name: '11' }, { id: '12', name: '12' }, { id: '13', name: '13' }, { id: '14', name: '14' }, { id: '15', name: '15' }], // 搅拌延时
       selectHistoryTimeList: [{ id: 0, name: '2020-06-10' }, { id: 1, name: '2020-06-11' }, { id: 2, name: '2020-06-12' }, { id: 3, name: '2020-06-13' }], // 请选择历史记录时间
-      sourceList: [{ id: 0, name: '自定义' }, { id: 1, name: '集团下发' }, { id: 2, name: '导入' }], // 导入
-
       arrowDown: true,
       arrowUp: false,
       ispastureuse: Cookies.get('ispastureuse'),
@@ -1056,7 +1058,8 @@ export default {
       getTcodeParm: {
         name: 'getTcode', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
         parammaps: { pastureid: '', fttypeid: '' }
-      }
+      },
+      sourceList: [{ id: '0', name: '自定义' }, { id: '1', name: '集团下发未调整' }, { id: '2', name: '集团下发有调整' }]
     }
   },
   computed: {
@@ -2404,12 +2407,12 @@ export default {
       this.table2.temp.id = row.id
       console.log('this.table2.updateList', this.table2.updateList)
       console.log('temp', this.table2.temp)
-      // var status = ''
-      // if (parseFloat(this.table2.temp.fweight) > parseFloat(this.table2.updateList.fweight)) {
-      //   status = 0
-      // } else {
-      //   status = 1
-      // }
+      var status = ''
+      if (parseFloat(this.table2.temp.fweight) > parseFloat(this.table2.updateList.fweight)) {
+        status = 0
+      } else {
+        status = 1
+      }
       if (this.table2.temp.fid == '' && this.table2.temp.fweight == '' && this.table2.temp.autosecond == '') {
         this.$message({ type: 'error', message: '饲料名称/重量/搅拌延时不能为空', duration: 2000 })
         return false
@@ -2479,7 +2482,7 @@ export default {
         pastureid: row.pastureid,
         ftid: this.table2.getdataListParm.parammaps.ftid,
         type: this.table2.getdataListParm.parammaps.fttypeid,
-        // status: status
+        status: status
       }}
       this.requestParam.data[3] = { 'name': 'updateFTdetailbySort', 'type': 'e', 'parammaps': {
         pastureid: row.pastureid,
@@ -2491,9 +2494,8 @@ export default {
         pastureid: this.table2.getdataListParm.parammaps.pastureid,
         ftid: this.table2.getdataListParm.parammaps.ftid
       }}
-      const url = 'authdata/ftdetail/edit'
-      const data = this.requestParam
-      postJson(url, data).then(response => {
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('新增保存发送参数', this.requestParam)
         if (response.msg !== 'fail') {
           this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
           this.getList2()
@@ -2503,17 +2505,6 @@ export default {
           this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
         }
       })
-      // ExecDataByConfig(this.requestParam).then(response => {
-      //   console.log('新增保存发送参数', this.requestParam)
-      //   if (response.msg !== 'fail') {
-      //     this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-      //     this.getList2()
-      //     this.getList3()
-      //     this.dropState = false
-      //   } else {
-      //     this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-      //   }
-      // })
     },
     updateCancel2(row) {
       console.log('点击了详情编辑取消')
@@ -3040,8 +3031,8 @@ export default {
       // var height = (document.documentElement.clientHeight - 165 + 80).toString() + 'px'
       // var height2 = '-' + (document.documentElement.clientHeight - 400).toString() + 'px'
       var height2 = '-' + (this.$refs.template.offsetHeight).toString() + 'px'
-      console.log(this.$refs.detail.offsetHeight)
-      console.log(height2, 'height2')
+      // console.log(this.$refs.detail.offsetHeight)
+      // console.log(height2, 'height2')
       this.isEnlarge = false
       this.$refs.detail.style.top = height2
       this.$refs.detail.style.height = height

src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -180,9 +180,11 @@ export default {
       handler(show) {
         console.log(show, 'show')
         this.visible = show
-        setTimeout(() => {
-          this.getList1()
-        }, 500)
+        if(show == true){
+          setTimeout(() => {
+            this.getList1()
+          }, 500)
+        }
       }
     },
     titleFname: {