更新5-31

src/api/common.js

@@ -109,7 +109,8 @@ export function GetAccount(data) {
 export function postJson(url,data) {
   return request({
     url: process.env.VUE_APP_BASE_API + url,
-    method: 'post',
+    method: 'post',
+    timeout: 600000,
     data
   })
 }

src/views/formulationPlan/recipeTemplate/index.vue

@@ -2592,21 +2592,21 @@ export default {
             slid: row.id,
             fid: row.fid
           }}
-          this.requestParam.data[1] = { 'name': 'checkdeleteFT', 'type': 'v', 'parammaps': {
-            pastureid: this.table2.getdataListParm.parammaps.pastureid,
-            id: this.table2.getdataListParm.parammaps.ftid
-          }}
-          this.requestParam.data[2] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
+          // this.requestParam.data[1] = { 'name': 'checkdeleteFT', 'type': 'v', 'parammaps': {
+          //   pastureid: this.table2.getdataListParm.parammaps.pastureid,
+          //   id: this.table2.getdataListParm.parammaps.ftid
+          // }}
+          this.requestParam.data[1] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
             id: row.id
           }}
-          this.requestParam.data[3] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
+          this.requestParam.data[2] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
             pastureid: row.pastureid,
             ftid: this.table2.getdataListParm.parammaps.ftid,
             type: this.table2.getdataListParm.parammaps.fttypeid,
             status: 1
           }}
-          this.requestParam.data[4] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
+          this.requestParam.data[3] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
             pastureid: this.table2.getdataListParm.parammaps.pastureid,
             id: this.table2.getdataListParm.parammaps.ftid
           }}
@@ -2681,51 +2681,63 @@ export default {
               type: this.table2.getdataListParm.parammaps.fttypeid,
               status: 1
             }}
+            const url = 'authdata/ftdetail/edit'
+            const data = this.requestParam
+            postJson(url, data).then(response => {
+              if (response.msg !== 'fail') {
+                this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+                this.getList2()
+                this.getList3()
+              } else {
+                this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              }
+            })
           } else {
             this.requestParam.common = { 'returnmap': '0' }
             this.requestParam.data = []
-            this.requestParam.data[0] = { 'name': 'checkdeleteFT', 'type': 'v', 'parammaps': {
+            // this.requestParam.data[0] = { 'name': 'checkdeleteFT', 'type': 'v', 'parammaps': {
+            //   pastureid: this.table2.getdataListParm.parammaps.pastureid,
+            //   id: this.table2.getdataListParm.parammaps.ftid
+            // }}
+            // this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList2 }}
+            // this.requestParam.data[1].children = []
+            // this.requestParam.data[1].children[0] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
+            //   id: '@insertSpotList.id',
+            //   pastureid: '@insertSpotList.pastureid'
+            // }}
+            this.requestParam.data[0] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
               pastureid: this.table2.getdataListParm.parammaps.pastureid,
               id: this.table2.getdataListParm.parammaps.ftid
             }}
-            this.requestParam.data[1] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList2 }}
-            this.requestParam.data[1].children = []
-            this.requestParam.data[1].children[0] = { 'name': 'deleteFTdetail', 'type': 'e', 'parammaps': {
-              id: '@insertSpotList.id',
-              pastureid: '@insertSpotList.pastureid'
-            }}
-            this.requestParam.data[2] = { 'name': 'updateftversion', 'type': 'e', 'parammaps': {
-              pastureid: this.table2.getdataListParm.parammaps.pastureid,
-              id: this.table2.getdataListParm.parammaps.ftid
-            }}
-            this.requestParam.data[3] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
-              pastureid: this.table2.getdataListParm.parammaps.pastureid,
-              ftid:this.table2.getdataListParm.parammaps.ftid,
-              type: this.table2.getdataListParm.parammaps.fttypeid,
-              status: 1
-            }}
+            // this.requestParam.data[3] = { 'name': 'updateFPbyFTChange', 'type': 'e', 'parammaps': {
+            //   pastureid: this.table2.getdataListParm.parammaps.pastureid,
+            //   ftid:this.table2.getdataListParm.parammaps.ftid,
+            //   type: this.table2.getdataListParm.parammaps.fttypeid,
+            //   status: 1
+            // }}
+            ExecDataByConfig(this.requestParam).then(response => {
+              console.log('删除保存发送参数', this.requestParam)
+              if (response.msg === 'fail') {
+                this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+              } else {
+                const url = 'authdata/ftdetai/del'
+                const data = {}
+                data.parammaps = {}
+                data.parammaps.pastureid = this.table2.getdataListParm.parammaps.pastureid
+                data.parammaps.ftid = this.table2.getdataListParm.parammaps.ftid
+                data.parammaps.type = this.table2.getdataListParm.parammaps.fttypeid
+                postJson(url, data).then(response => {
+                  if (response.msg !== 'fail') {
+                    this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
+                    this.getList2()
+                    this.getList3()
+                  } else {
+                    this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
+                  }
+                })
+              }
+            })
           }
-          const url = 'authdata/ftdetail/edit'
-          const data = this.requestParam
-          postJson(url, data).then(response => {
-            if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
-              this.getList2()
-              this.getList3()
-            } else {
-              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: response.data, type: 'warning', duration: 2000 })
-          //   } else {
-          //     this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
-          //     this.getList2()
-          //     this.getList3()
-          //   }
-          // })
         })
       }
     },

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

@@ -795,7 +795,7 @@
             <u-table-column sortable label="配方名称" min-width="90px" align="center" prop="配方名称" />
             <u-table-column sortable label="栏舍" min-width="90px" align="center" prop="栏舍" />
             <!-- 临时注释 -->
-            <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
+            <!-- <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
               <template slot-scope="{row}">
                 <a @click="clickRecipeName3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
               </template>
@@ -804,7 +804,7 @@
               <template slot-scope="{row}">
                 <a @click="clickFence3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.栏舍 }}</a>
               </template>
-            </u-table-column>
+            </u-table-column> -->
             <!-- 临时注释 -->
             <u-table-column sortable label="理论重量" min-width="55px" align="center" prop="理论重量" />
             <u-table-column sortable label="实际重量" min-width="55px" align="center" prop="实际重量" />
@@ -953,9 +953,9 @@
                   <u-table-column label="实际牛头数" min-width="100px" align="center" prop="times" />
                   <u-table-column label="系数（%）" min-width="100px" align="center" prop="times" />
                   <u-table-column label="系数头数" min-width="100px" align="center" prop="times" />
-                  <u-table-column label="配方模板" min-width="70px" align="center" prop="barname">
+                  <u-table-column label="配方模板" min-width="70px" align="center" prop="times">
                     <template slot-scope="{row}">
-                      <a @click="clickRecipeTemplate3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.barname }}</a>
+                      <a @click="clickRecipeTemplate3(row)" style="text-decoration: underline;color: #0000FF;">{{ row.times }}</a>
                     </template>
                   </u-table-column>
                   <u-table-column label="比例（%）" min-width="100px" align="center" prop="times" />
@@ -998,6 +998,83 @@
           <el-button class="cancelClose1" @click="fenceTemp.dialogFormVisible = false; ">关闭</el-button>
         </div>
     </el-dialog>
+    <!-- 配方模板修改记录 -->
+    <el-dialog :title="textMap[modificationRecordTemp.dialogStatus]" :visible.sync="modificationRecordTemp.dialogFormVisible" :close-on-click-modal="false" width="98%">
+      <div class="modificationRecord">
+        <h3 style="flex: 1;">修改前</h3>
+        <div class="top">
+          <div class="left">
+            <div><b>配方名称</b>:{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>配方编码</b>:{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>配方颜色</b>:{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>牲畜类别</b>:{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>配方类型</b>:{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>来源:</b>{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>版本号:</b>{{modificationRecordTemp.temp1.times}}</div>
+            <div><b>备注:</b>{{modificationRecordTemp.temp1.times}}</div>
+          </div>
+          <div class="right">
+            <el-table
+              :key="modificationRecordTemp.tableKey1"
+              v-loading="modificationRecordTemp.listLoading1"
+              element-loading-text="给我一点时间"
+              :data="modificationRecordTemp.list1"
+              border
+              fit
+              highlight-current-row
+              style="width: 100%;"
+              height="300"
+              :row-style="rowStyle"
+              :cell-style="cellStyle"
+              class="elTable table-fixed"
+            >
+              <el-table-column label="饲料组" min-width="90px" align="center" prop="日期" />
+              <el-table-column label="饲料名称" min-width="90px" align="center" prop="名称" />
+              <el-table-column label="重量(KG)" min-width="100px" align="center" prop="理论量" />
+              <el-table-column label="搅拌延时(min)" min-width="100px" align="center" prop="实际量" />
+            </el-table>
+          </div>
+        </div>
+        <hr/>
+        <h3 style="color: red;">修改后</h3>
+        <div class="bottom">
+          <div class="left">
+            <div><b>配方名称:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>配方编码:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>配方颜色:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>牲畜类别:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>配方类型:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>来源:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>版本号:</b>{{modificationRecordTemp.temp2.times}}</div>
+            <div><b>备注:</b>{{modificationRecordTemp.temp2.times}}</div>
+          </div>
+          <div class="right">
+            <el-table
+              :key="modificationRecordTemp.tableKey2"
+              v-loading="modificationRecordTemp.listLoading2"
+              element-loading-text="给我一点时间"
+              :data="modificationRecordTemp.list2"
+              border
+              fit
+              highlight-current-row
+              style="width: 100%;"
+              height="300"
+              :row-style="rowStyle"
+              :cell-style="cellStyle"
+              class="elTable table-fixed"
+            >
+              <el-table-column label="饲料组"  min-width="90px" align="center" prop="日期" />
+              <el-table-column label="饲料名称"  min-width="90px" align="center" prop="名称" />
+              <el-table-column label="重量(KG)"  min-width="100px" align="center" prop="理论量" />
+              <el-table-column label="搅拌延时(min)"  min-width="100px" align="center" prop="实际量" />
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="cancelClose1" @click="modificationRecordTemp.dialogFormVisible = false; ">关闭</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -1524,7 +1601,8 @@ export default {
         exportList: '导出',
         recipeNameTxt:'配方修改记录',
         feedTxt:'饲料',
-        fenceTxt:'栏舍'
+        fenceTxt:'栏舍',
+        modificationRecord:'配方模板修改记录'
       },
       isokDisable:false,
       // search
@@ -1569,6 +1647,22 @@ export default {
           tableKey: 0, total: 0, listLoading: true, list: [],
         },
         activeName:'first'
+      },
+      modificationRecordTemp:{
+        dialogStatus: '',
+        dialogFormVisible: false,
+        getdataListParm1: {
+          name: 'getPlanModifyFPlist',page: 1, offset: 1, pagecount: '', returntype: 'Map',
+          parammaps: { inputDatetime: '', pastureid: '', fitid: '' }
+        },
+        tableKey1: 0, total1: 0, listLoading1: false, list1: [],
+        getdataListParm2: {
+          name: 'getPlanModifyFPlist',page: 1, offset: 1, pagecount: '', returntype: 'Map',
+          parammaps: { inputDatetime: '', pastureid: '', fitid: '' }
+        },
+        tableKey2: 0, total2: 0, listLoading2: false, list2: [],
+        temp1:{},
+        temp2:{}
       }
     }
   },
@@ -4580,7 +4674,48 @@ export default {
         }
       }
     },
-    clickRecipeTemplate3(){}
+    clickRecipeTemplate3(row){
+      this.modificationRecordTemp.temp1 = Object.assign({}, row)
+      this.modificationRecordTemp.temp2 = Object.assign({}, row)
+      this.modificationRecordTemp.dialogFormVisible = true
+      this.modificationRecordTemp.dialogStatus = 'modificationRecord'
+      this.getRecipeTemplateList1()
+      this.getRecipeTemplateList2()
+    },
+    getRecipeTemplateList1() {
+      this.modificationRecordTemp.listLoading1 = true
+      let url = 'authdata/GetDataByName'
+      let data = {}
+      data.parammaps = this.modificationRecordTemp.getdataListParm1.parammaps
+      postJson(url, data).then(response => {
+        // if (response.data.list !== null) {
+        //   this.modificationRecordTemp.list1 = response.data.list
+        // } else {
+          this.modificationRecordTemp.list1 = []
+        // }
+        // this.modificationRecordTemp.total1 = response.data.total
+        setTimeout(() => {
+          this.modificationRecordTemp.listLoading1 = false
+        }, 100)
+      })
+    },
+    getRecipeTemplateList2() {
+      this.modificationRecordTemp.listLoading2 = true
+      let url = 'authdata/GetDataByName'
+      let data = {}
+      data.parammaps = this.modificationRecordTemp.getdataListParm2.parammaps
+      postJson(url, data).then(response => {
+        // if (response.data.list !== null) {
+        //   this.modificationRecordTemp.list2 = response.data.list
+        // } else {
+          this.modificationRecordTemp.list2 = []
+        // }
+        // this.modificationRecordTemp.total2 = response.data.total
+        setTimeout(() => {
+          this.modificationRecordTemp.listLoading2 = false
+        }, 100)
+      })
+    },
   }
 }
 </script>
@@ -4616,4 +4751,28 @@ export default {
   /deep/ .specificDate .el-radio{margin-right: 0px;}
   /deep/ .el-radio-button__inner{padding: 7px 7px ;}
   /deep/ .el-range-editor.el-input__inner .el-input__icon{width: 0;}
+  .modificationRecord .top{
+    height: 300px;width: 100%;display: flex;flex-direction: row;
+    .left{
+      width: 200px;
+      height: 100%;
+      div{line-height: 35px;}
+    }
+    .right {
+        height: 200px;
+        flex: 1;
+    }
+  }
+  .modificationRecord .bottom{
+    height: 300px;width: 100%;display: flex;flex-direction: row;
+    .left{
+      width: 200px;
+      height: 100%;
+      div{line-height: 35px;}
+    }
+    .right {
+        height: 200px;
+        flex: 1;
+    }
+  }
 </style>

src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -109,7 +109,7 @@
         </div>
         <div v-if="tab3.table.tableConfig.length>2">
         <u-table v-if="isDispayTable3" ref="plTable3" v-loading="tab3.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable3">
-          <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center" :prop="item.prop" :fixed="key==0">
+          <u-table-column v-for="(item,key) in tab3.table.tableConfig" :key="key" :label="item.label" :show-overflow-tooltip="item.showOverflow" align="center"  :prop="item.prop" :fixed="key==0">
               <u-table-column v-for="(item1,key1) in item.children" v-if="item.children || item.children.length>0" :key="key1" align="center" :label="item1.label" :prop="item1.prop" :min-width="item1.width">
                 <u-table-column v-for="(item2,key2) in item1.children" v-if="item1.children || item1.children.length>0" :key="key2" :label="item2.label" :prop="item2.prop" />
               </u-table-column>
@@ -881,4 +881,12 @@ export default {
     padding-right: 0 !important;;
   }
   // .el-radio{margin-right: 20px;}
+</style>
+<style lang="css">
+  .el-tooltip__popper{
+  max-width: 60% !important;
+  }
+  .plTableBox .el-table td.is-hidden>*, .plTableBox .el-table th.is-hidden>*{
+    visibility:inherit;
+  }
 </style>