1.舍组栏新增ud编码ud名称；2.日执行新增清空按钮；3.栏舍配方干物质取行内参数；4.准确性分析优化table

src/icons/svg/clear.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1706089269266" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2548" xmlns:xlink="http://www.w3.org/1999/xlink" width="42" height="42"><path d="M901.3 504.8l-76.3-150c-13.4-26.3-40-42.6-69.5-42.6H639c-1.1 0-2-0.9-2-2V120.6c0-31.1-25.3-56.3-56.3-56.3h-90c-31.1 0-56.3 25.3-56.3 56.3v189.6c0 1.1-0.9 2-2 2H315.8c-29.5 0-56.1 16.3-69.5 42.6l-76.3 150c-9.2 18.1-8.4 39.3 2.2 56.6 10.3 16.8 27.9 27 47.4 27.6-4.8 101-38.3 205.9-90.2 279.5-12.5 17.8-14.1 40.8-4.1 60.1 10 19.3 29.7 31.3 51.5 31.3h601.5c35 0 66-23.6 75.2-57.4 15.5-56.5 28.4-107.9 29.4-164.9C884 685 874 636 852.9 589c19-1.1 36.1-11.2 46.2-27.6 10.6-17.3 11.4-38.5 2.2-56.6z m-681.4 25.4l76.3-150c3.8-7.4 11.3-12 19.6-12h116.4c32 0 58-26 58-58V120.6c0-0.1 0.2-0.3 0.3-0.3h90c0.1 0 0.3 0.2 0.3 0.3v189.6c0 32 26 58 58 58h116.4c8.3 0 15.8 4.6 19.6 12l76.3 150c0.2 0.3 0.5 1-0.1 2s-1.3 1-1.7 1H221.7c-0.4 0-1.1 0-1.7-1-0.6-1-0.3-1.7-0.1-2zM827 736.6c-0.9 50.5-12.9 98.3-27.4 151.1-2.6 9.5-11.3 16.2-21.2 16.2H651.8c11.3-22.3 18.5-44 23.1-61.2 7.1-26.7 10.7-53.5 10.6-78-0.1-17.1-15.5-30.1-32.4-27.4-13.6 2.2-23.6 14-23.6 27.8 0.1 42.7-14.1 98.2-42.7 138.8H406.2c15.2-21.7 26.1-43.8 33.6-61.9 10-24.3 17.4-49.7 21.2-72.5 2.8-17-10.4-32.5-27.6-32.5-13.6 0-25.3 9.8-27.6 23.3-2.8 16.6-8.3 37.7-17.7 60.4-10.1 24.6-27.8 58.1-55.6 83.3H176.9c-0.5 0-1.2 0-1.8-1.1-0.6-1.1-0.2-1.6 0.1-2 29.7-42.1 54.8-94.5 72.5-151.4 16.2-52.1 25.7-106.9 28-160.3h514.6C816 635.6 828 684 827 736.6z" fill="" p-id="2549"></path></svg>

src/views/basicData/groupColumn/index.vue

@@ -112,6 +112,16 @@
           <template slot-scope="scope">
             <el-switch v-model="scope.row.enable" :disabled="scope.row.NoEdit==true" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleEnableChange(scope.$index, scope.row)" />
           </template>
+        </el-table-column>
+        <el-table-column label="ud编码" min-width="110px" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.udcode}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="ud名称" min-width="110px" align="center">
+          <template slot-scope="scope">
+            <span>{{scope.row.udname}}</span>
+          </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -207,6 +207,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData2(row,'0')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel2(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,0)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -267,6 +271,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData2(row,'0')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel2(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,0)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -315,6 +323,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData3(row,'1')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel3(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <e<el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,1)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -459,6 +471,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData2(row,'0')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel2(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,0)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -507,6 +523,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData3(row,'1')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel3(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,1)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -566,6 +586,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData3(row,'0')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel3(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,0)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -614,6 +638,10 @@
                     <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData2(row,'1')" />
                     <span v-if="row.isUpdateSave" class="centerSpan">|</span>
                     <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel2(row)" />
+                    <span v-if="row.isUpdate && isRoleEdit" class="centerSpan">|</span>
+                    <el-button v-if="row.isUpdate && isRoleEdit" class="miniSuccess" @click="handleRowEmpty(row,1)">
+                      <svg-icon icon-class="clear" />
+                    </el-button>
                   </template>
                 </el-table-column>
               </el-table>
@@ -3022,6 +3050,43 @@ export default {
           })
         }
       })
+    },
+    handleRowEmpty(row,plan){
+      console.log(row,'row')
+      MessageBox.confirm('您确定清空该操作序号以下的所有数据，如果您清空的是搅拌车数据，将会同步清空撒料车数据?', {
+        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': 'delDownloadedplan', 'type': 'e', 'parammaps': {
+          id: '@insertSpotList.id',
+          pastureid: '@insertSpotList.pastureid'
+        }}
+        const url = 'authdata/PostDataByName'
+        const data = {
+          name:'clearDeleteDownloadedplan',
+          parammaps:{
+            pid:row.pid,
+            lpplantype:this.table3.getdataListParm.parammaps.lpplantype,
+            plan:plan,
+            sort:row.sort
+          }
+        }
+        postJson(url,data).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.getList2()
+            this.getList3()
+          }
+        })
+      })
     }
   }
 }

src/views/formulationPlan/dhedFormula/index.vue

@@ -1248,13 +1248,13 @@ export default {
             this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
             this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
             this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
-            if (response.data.list[i].ftid !== undefined && response.data.list[i].ftid !== '') {
-              if (this.recipeTemplateList.find(obj => obj.id == response.data.list[i].ftid) !== undefined) {
-                this.$set(response.data.list[i], 'dryweight', this.recipeTemplateList.find(obj => obj.id == response.data.list[i].ftid).dryweight) // 编辑保存
-              } else {
-                this.$set(response.data.list[i], 'dryweight', '')
-              }
-            }
+            // if (response.data.list[i].ftid !== undefined && response.data.list[i].ftid !== '') {
+            //   if (this.recipeTemplateList.find(obj => obj.id == response.data.list[i].ftid) !== undefined) {
+            //     this.$set(response.data.list[i], 'dryweight', this.recipeTemplateList.find(obj => obj.id == response.data.list[i].ftid).dryweight) // 编辑保存
+            //   } else {
+            //     this.$set(response.data.list[i], 'dryweight', '')
+            //   }
+            // }
             if (response.data.list[i].ftid == undefined || response.data.list[i].ftname == '') {
               this.$set(response.data.list[i], 'ftid', '')
               this.$set(response.data.list[i], 'ftname', '')

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

@@ -63,7 +63,8 @@
         </div>
         <div id="table" class="table">
           <h4>混料</h4>
-          <el-table
+          <u-table
+            ref="plTable1"
             :key="tab.table.tableKey"
             v-loading="tab.table.listLoading"
             element-loading-text="给我一点时间"
@@ -77,56 +78,58 @@
             class="elTable table-fixed"
             :max-height="myHeight2"
           >
-            <el-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable label="日期" min-width="70px" align="center" prop="计划时间" />
-            <el-table-column v-if="tab.isTrainNumber" :key="117" sortable label="日期" min-width="70px" align="center" prop="计划时间1" />
-            <el-table-column v-if="tab.isTrainNumber" :key="113" sortable label="配方名称" min-width="70px" align="center" prop="templetname" />
-            <el-table-column v-if="tab.isTrainNumber" :key="114" sortable label="车辆名称" min-width="70px" align="center" prop="TMR名称" />
-            <el-table-column v-if="tab.isTrainNumber" :key="115" sortable label="开始时间" min-width="70px" align="center" prop="startTime" />
-            <el-table-column v-if="tab.isTrainNumber" :key="116" sortable label="结束时间" min-width="70px" align="center" prop="endTime" />
-            <el-table-column v-if="tab.isDriver" :key="1" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
-            <el-table-column v-if="tab.isFormulaName" :key="2" sortable label="配方名称" min-width="70px" align="center" prop="配方名称" />
-            <el-table-column v-if="tab.isHouseName" :key="3" sortable label="栏舍名称" min-width="70px" align="center" prop="栏舍名称" />
-            <el-table-column v-if="tab.isLivestockType" :key="4" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
-            <el-table-column v-if="tab.isTrainNumber" :key="5" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-            <el-table-column v-if="tab.isTrainNumber" :key="6" sortable label="车次" min-width="70px" align="center" prop="车次" />
-            <el-table-column v-if="tab.isTrainNumber" :key="7" sortable label="班次" min-width="70px" align="center" prop="班次" />
-            <el-table-column v-if="tab.isTrainNumber" :key="8" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
-            <el-table-column v-if="tab.isTMRName" :key="9" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-            <el-table-column v-if="tab.isTMRName" :key="10" sortable label="班次" min-width="70px" align="center" prop="班次" />
-            <el-table-column v-if="tab.isTMRName" :key="11" sortable label="车次" min-width="70px" align="center" prop="车次" />
-            <el-table-column v-if="tab.isTMRName" :key="12" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
-            <el-table-column v-if="tab.isFeed" :key="13" sortable label="饲料" min-width="70px" align="center" prop="fname" />
-            <el-table-column :key="14" sortable label="理论重量" min-width="60px" align="center" prop="理论重量" />
-            <el-table-column :key="15" sortable label="实际重量" min-width="60px" align="center" prop="实际重量" />
-            <el-table-column :key="16" sortable label="计划混料操作数" min-width="60px" align="center" prop="计划混料操作数" />
-            <el-table-column :key="17" sortable label="已混料操作数" min-width="50px" align="center" prop="已混料操作数" />
-            <el-table-column :key="18" sortable label="混料操作率" min-width="60px" align="center" prop="混料操作率" />
-            <el-table-column :key="19" sortable label="混料误差值" min-width="60px" align="center" prop="混料误差值" />
-            <el-table-column :key="20" sortable label="混料准确率" min-width="60px" align="center" prop="混料准确率" />
-            <el-table-column v-if="tab.isTrainNumber" :key="21" sortable label="混料时间" min-width="70px" align="center" prop="混料时间" />
-            <el-table-column v-if="tab.isTrainNumber" :key="22" sortable label="等待时间" min-width="70px" align="center" prop="等待时间" />
-            <el-table-column :key="23" sortable label="混料自动跳转次数" min-width="65px" align="center" prop="混料自动跳转次数" />
-            <el-table-column :key="24" sortable label="混料手动跳转次数" min-width="65px" align="center" prop="混料手动跳转次数" />
-            <el-table-column :key="25" sortable label="取消次数" min-width="70px" align="center" prop="取消次数" />
-            <el-table-column :key="26" sortable label="混料正确数" min-width="70px" align="center" prop="混料正确数" />
-            <el-table-column :key="27" sortable label="混料正确率" min-width="70px" align="center" prop="混料正确率" />
-            <el-table-column :key="28" sortable label="去除取消正确率" min-width="60px" align="center" prop="去除取消正确率" />
-            <el-table-column :key="29" sortable label="标准差" min-width="60px" align="center" prop="方差" />
-            <el-table-column v-if="activeName=='first' && tab.table.list !== null" :key="30" align="center" width="70" label="操作" class-name="small-padding fixed-width" fixed="right">
+            <u-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable label="日期" min-width="70px" align="center" prop="计划时间" />
+            <u-table-column v-if="tab.isTrainNumber" :key="117" sortable label="日期" min-width="70px" align="center" prop="计划时间1" />
+            <u-table-column v-if="tab.isTrainNumber" :key="113" sortable label="配方名称" min-width="70px" align="center" prop="templetname" />
+            <u-table-column v-if="tab.isTrainNumber" :key="114" sortable label="车辆名称" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column v-if="tab.isTrainNumber" :key="115" sortable label="开始加料时间" min-width="70px" align="center" prop="startTime" />
+            <u-table-column v-if="tab.isTrainNumber" :key="116" sortable label="结束加料时间" min-width="70px" align="center" prop="endTime" />
+            <u-table-column v-if="tab.isDriver" :key="1" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
+            <u-table-column v-if="tab.isFormulaName" :key="2" sortable label="配方名称" min-width="70px" align="center" prop="配方名称" />
+            <u-table-column v-if="tab.isHouseName" :key="3" sortable label="栏舍名称" min-width="70px" align="center" prop="栏舍名称" />
+            <u-table-column v-if="tab.isLivestockType" :key="4" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
+            <u-table-column v-if="tab.isTrainNumber" :key="5" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column v-if="tab.isTrainNumber" :key="6" sortable label="车次" min-width="70px" align="center" prop="车次" />
+            <u-table-column v-if="tab.isTrainNumber" :key="7" sortable label="班次" min-width="70px" align="center" prop="班次" />
+            <u-table-column v-if="tab.isTrainNumber" :key="8" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
+            <u-table-column v-if="tab.isTMRName" :key="9" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
+            <u-table-column v-if="tab.isTMRName" :key="10" sortable label="班次" min-width="70px" align="center" prop="班次" />
+            <u-table-column v-if="tab.isTMRName" :key="11" sortable label="车次" min-width="70px" align="center" prop="车次" />
+            <u-table-column v-if="tab.isTMRName" :key="12" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
+            <u-table-column v-if="tab.isFeed" :key="13" sortable label="饲料" min-width="70px" align="center" prop="fname" />
+            <u-table-column :key="14" sortable label="理论重量" min-width="60px" align="center" prop="理论重量" />
+            <u-table-column :key="15" sortable label="实际重量" min-width="60px" align="center" prop="实际重量" />
+            <u-table-column :key="16" sortable label="计划混料操作数" min-width="60px" align="center" prop="计划混料操作数" />
+            <u-table-column :key="17" sortable label="已混料操作数" min-width="50px" align="center" prop="已混料操作数" />
+            <u-table-column :key="18" sortable label="混料操作率" min-width="60px" align="center" prop="混料操作率" />
+            <u-table-column :key="19" sortable label="混料误差值" min-width="60px" align="center" prop="混料误差值" />
+            <u-table-column :key="20" sortable label="混料准确率" min-width="60px" align="center" prop="混料准确率" />
+            <u-table-column v-if="tab.isTrainNumber" :key="21" sortable label="混料时间" min-width="70px" align="center" prop="混料时间" />
+            <u-table-column v-if="tab.isTrainNumber" :key="22" sortable label="发料开始时间" min-width="70px" align="center" prop="startMaterialTime" />
+            <u-table-column v-if="tab.isTrainNumber" :key="23" sortable label="等待时间" min-width="70px" align="center" prop="等待时间" />
+            <u-table-column :key="24" sortable label="混料自动跳转次数" min-width="65px" align="center" prop="混料自动跳转次数" />
+            <u-table-column :key="25" sortable label="混料手动跳转次数" min-width="65px" align="center" prop="混料手动跳转次数" />
+            <u-table-column :key="26" sortable label="取消次数" min-width="70px" align="center" prop="取消次数" />
+            <u-table-column :key="27" sortable label="混料正确数" min-width="70px" align="center" prop="混料正确数" />
+            <u-table-column :key="28" sortable label="混料正确率" min-width="70px" align="center" prop="混料正确率" />
+            <u-table-column :key="29" sortable label="去除取消正确率" min-width="60px" align="center" prop="去除取消正确率" />
+            <u-table-column :key="30" sortable label="标准差" min-width="60px" align="center" prop="方差" />
+            <u-table-column v-if="activeName=='first' && tab.table.list !== null" :key="31" align="center" width="70" label="操作" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
                 <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('1',row)" />
               </template>
-            </el-table-column>
-            <el-table-column v-else :key="30" align="center" width="70" label="操作" class-name="small-padding fixed-width">
+            </u-table-column>
+            <u-table-column v-else :key="31" align="center" width="70" label="操作" class-name="small-padding fixed-width">
               <template slot-scope="{row}">
                   <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('1',row)" />
               </template>
-            </el-table-column>
-          </el-table>
+            </u-table-column>
+          </u-table>
           <span v-if="tab.table.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab.table.total }}条</span>
           <div v-if="tab.radio !== '6'">
             <h4>撒料</h4>
-            <el-table
+            <u-table
+              ref="plTable22"
               :key="tab.table2.tableKey"
               v-loading="tab.table2.listLoading"
               element-loading-text="给我一点时间"
@@ -140,52 +143,53 @@
               class="elTable table-fixed"
               :max-height="myHeight2"
             >
-              <el-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable label="日期" min-width="70px" align="center" prop="计划时间" />
-              <el-table-column v-if="tab.isTrainNumber" :key="117" sortable label="日期" min-width="70px" align="center" prop="计划时间1" />
-              <el-table-column v-if="tab.isTrainNumber" :key="113" sortable label="配方名称" min-width="70px" align="center" prop="templetname" />
-              <el-table-column v-if="tab.isTrainNumber" :key="114" sortable label="车辆名称" min-width="70px" align="center" prop="TMR名称" />
-              <el-table-column v-if="tab.isTrainNumber" :key="115" sortable label="开始时间" min-width="70px" align="center" prop="startTime" />
-              <el-table-column v-if="tab.isTrainNumber" :key="116" sortable label="结束时间" min-width="70px" align="center" prop="endTime" />
-              <el-table-column v-if="tab.isDriver" :key="1" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
-              <el-table-column v-if="tab.isFormulaName" :key="2" sortable label="配方名称" min-width="70px" align="center" prop="配方名称" />
-              <el-table-column v-if="tab.isHouseName" :key="3" sortable label="栏舍名称" min-width="70px" align="center" prop="栏舍名称" />
-              <el-table-column v-if="tab.isLivestockType" :key="4" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
-              <el-table-column v-if="tab.isTrainNumber" :key="5" sortable label="车次" min-width="70px" align="center" prop="车次" />
-              <el-table-column v-if="tab.isTrainNumber" :key="6" sortable label="班次" min-width="70px" align="center" prop="班次" />
-              <el-table-column v-if="tab.isTrainNumber" :key="7" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-              <el-table-column v-if="tab.isTrainNumber" :key="8" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
-              <el-table-column v-if="tab.isTMRName" :key="9" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
-              <el-table-column v-if="tab.isTMRName" :key="10" sortable label="班次" min-width="70px" align="center" prop="班次" />
-              <el-table-column v-if="tab.isTMRName" :key="11" sortable label="车次" min-width="70px" align="center" prop="车次" />
-              <el-table-column v-if="tab.isTMRName" :key="12" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
-              <el-table-column v-if="tab.isFeed" :key="13" sortable label="饲料" min-width="70px" align="center" prop="饲料" />
-              <el-table-column :key="14" sortable label="理论重量" min-width="60px" align="center" prop="理论重量" />
-              <el-table-column :key="15" sortable label="实际重量" min-width="60px" align="center" prop="实际重量" />
-              <el-table-column :key="16" sortable label="计划撒料操作数" min-width="60px" align="center" prop="计划撒料操作数" />
-              <el-table-column :key="17" sortable label="已撒料操作数" min-width="50px" align="center" prop="已撒料操作数" />
-              <el-table-column :key="18" sortable label="撒料操作率" min-width="60px" align="center" prop="撒料操作率" />
-              <el-table-column :key="19" sortable label="撒料误差值" min-width="60px" align="center" prop="撒料误差值" />
-              <el-table-column :key="20" sortable label="撒料准确率" min-width="60px" align="center" prop="撒料准确率" />
-              <el-table-column v-if="tab.isTrainNumber" :key="21" sortable label="撒料时间" min-width="70px" align="center" prop="撒料时间" />
-              <el-table-column v-if="tab.isTrainNumber" :key="22" sortable label="等待时间" min-width="70px" align="center" prop="等待时间" />
-              <el-table-column :key="23" sortable label="撒料自动跳转次数" width="65px" align="center" prop="撒料自动跳转次数" />
-              <el-table-column :key="24" sortable label="撒料手动跳转次数" width="65px" align="center" prop="撒料手动跳转次数" />
-              <el-table-column :key="25" sortable label="取消次数" min-width="70px" align="center" prop="取消次数" />
-              <el-table-column :key="26" sortable label="撒料正确数" min-width="70px" align="center" prop="撒料正确数" />
-              <el-table-column :key="27" sortable label="撒料正确率" min-width="70px" align="center" prop="撒料正确率" />
-              <el-table-column :key="28" sortable label="去除取消正确率" min-width="65px" align="center" prop="去除取消正确率" />
-              <el-table-column :key="29" sortable label="标准差" min-width="60px" align="center" prop="方差" />
-              <el-table-column v-if="activeName=='first' && tab.table2.list !== null" :key="30" align="center" width="70" label="操作" class-name="small-padding fixed-width" fixed="right">
+              <u-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable label="日期" min-width="70px" align="center" prop="计划时间" />
+              <u-table-column v-if="tab.isTrainNumber" :key="117" sortable label="日期" min-width="70px" align="center" prop="计划时间1" />
+              <u-table-column v-if="tab.isTrainNumber" :key="113" sortable label="配方名称" min-width="70px" align="center" prop="templetname" />
+              <u-table-column v-if="tab.isTrainNumber" :key="114" sortable label="车辆名称" min-width="70px" align="center" prop="TMR名称" />
+              <u-table-column v-if="tab.isTrainNumber" :key="115" sortable label="开始加料时间" min-width="70px" align="center" prop="startTime" />
+              <u-table-column v-if="tab.isTrainNumber" :key="116" sortable label="结束加料时间" min-width="70px" align="center" prop="endTime" />
+              <u-table-column v-if="tab.isDriver" :key="1" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
+              <u-table-column v-if="tab.isFormulaName" :key="2" sortable label="配方名称" min-width="70px" align="center" prop="配方名称" />
+              <u-table-column v-if="tab.isHouseName" :key="3" sortable label="栏舍名称" min-width="70px" align="center" prop="栏舍名称" />
+              <u-table-column v-if="tab.isLivestockType" :key="4" sortable label="牲畜类别" min-width="70px" align="center" prop="牲畜类别" />
+              <u-table-column v-if="tab.isTrainNumber" :key="5" sortable label="车次" min-width="70px" align="center" prop="车次" />
+              <u-table-column v-if="tab.isTrainNumber" :key="6" sortable label="班次" min-width="70px" align="center" prop="班次" />
+              <u-table-column v-if="tab.isTrainNumber" :key="7" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
+              <u-table-column v-if="tab.isTrainNumber" :key="8" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
+              <u-table-column v-if="tab.isTMRName" :key="9" sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
+              <u-table-column v-if="tab.isTMRName" :key="10" sortable label="班次" min-width="70px" align="center" prop="班次" />
+              <u-table-column v-if="tab.isTMRName" :key="11" sortable label="车次" min-width="70px" align="center" prop="车次" />
+              <u-table-column v-if="tab.isTMRName" :key="12" sortable label="驾驶员" min-width="70px" align="center" prop="驾驶员" />
+              <u-table-column v-if="tab.isFeed" :key="13" sortable label="饲料" min-width="70px" align="center" prop="饲料" />
+              <u-table-column :key="14" sortable label="理论重量" min-width="60px" align="center" prop="理论重量" />
+              <u-table-column :key="15" sortable label="实际重量" min-width="60px" align="center" prop="实际重量" />
+              <u-table-column :key="16" sortable label="计划撒料操作数" min-width="60px" align="center" prop="计划撒料操作数" />
+              <u-table-column :key="17" sortable label="已撒料操作数" min-width="50px" align="center" prop="已撒料操作数" />
+              <u-table-column :key="18" sortable label="撒料操作率" min-width="60px" align="center" prop="撒料操作率" />
+              <u-table-column :key="19" sortable label="撒料误差值" min-width="60px" align="center" prop="撒料误差值" />
+              <u-table-column :key="20" sortable label="撒料准确率" min-width="60px" align="center" prop="撒料准确率" />
+              <u-table-column v-if="tab.isTrainNumber" :key="21" sortable label="撒料时间" min-width="70px" align="center" prop="撒料时间" />
+              <u-table-column v-if="tab.isTrainNumber" :key="22" sortable label="发料开始时间" min-width="70px" align="center" prop="startMaterialTime" />
+              <u-table-column v-if="tab.isTrainNumber" :key="22" sortable label="等待时间" min-width="70px" align="center" prop="等待时间" />
+              <u-table-column :key="23" sortable label="撒料自动跳转次数" width="65px" align="center" prop="撒料自动跳转次数" />
+              <u-table-column :key="24" sortable label="撒料手动跳转次数" width="65px" align="center" prop="撒料手动跳转次数" />
+              <u-table-column :key="25" sortable label="取消次数" min-width="70px" align="center" prop="取消次数" />
+              <u-table-column :key="26" sortable label="撒料正确数" min-width="70px" align="center" prop="撒料正确数" />
+              <u-table-column :key="27" sortable label="撒料正确率" min-width="70px" align="center" prop="撒料正确率" />
+              <u-table-column :key="28" sortable label="去除取消正确率" min-width="65px" align="center" prop="去除取消正确率" />
+              <u-table-column :key="29" sortable label="标准差" min-width="60px" align="center" prop="方差" />
+              <u-table-column v-if="activeName=='first' && tab.table2.list !== null" :key="30" align="center" width="70" label="操作" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="{row}">
                   <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('2',row)" />
                 </template>
-              </el-table-column>
-              <el-table-column v-else :key="30" align="center" width="70" label="操作" class-name="small-padding fixed-width">
+              </u-table-column>
+              <u-table-column v-else :key="30" align="center" width="70" label="操作" class-name="small-padding fixed-width">
                 <template slot-scope="{row}">
                     <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee('2',row)" />
                   </template>
-                </el-table-column>
-            </el-table>
+                </u-table-column>
+            </u-table>
             <span v-if="tab.table2.listLoading == false" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab.table2.total }}条</span>
           </div>
         </div>
@@ -2628,14 +2632,14 @@ export default {
         } else if (this.tab.radio == '4') {
           var excelDatas4 = [
             {
-              tHeader: ['日期','配方名称','车辆名称','开始时间','结束时间', 'TMR名称', '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数','混料正确数','混料正确率','去除取消正确率',  '标准差'],
-              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime','TMR名称',  '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数', '混料正确数','混料正确率','去除取消正确率', '方差'],
+              tHeader: ['日期','配方名称','车辆名称','开始加料时间','结束加料时间', 'TMR名称', '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','发料开始时间','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数','混料正确数','混料正确率','去除取消正确率',  '标准差'],
+              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime','TMR名称',  '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','startMaterialTime','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数', '混料正确数','混料正确率','去除取消正确率', '方差'],
               tableDatas: this.tab.table.list,
               sheetName: '混料'
             },
             {
-              tHeader: ['日期','配方名称','车辆名称','开始时间','结束时间', 'TMR名称', '车次','班次', '驾驶员','理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率', '撒料时间','等待时间','撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '标准差'],
-              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime', 'TMR名称', '车次','班次', '驾驶员', '理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率','撒料时间','等待时间', '撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '方差'],
+              tHeader: ['日期','配方名称','车辆名称','开始加料时间','结束加料时间', 'TMR名称', '车次','班次', '驾驶员','理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率', '撒料时间','发料开始时间','等待时间','撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '标准差'],
+              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime', 'TMR名称', '车次','班次', '驾驶员', '理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率','撒料时间','startMaterialTime','等待时间', '撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '方差'],
               tableDatas: this.tab.table2.list,
               sheetName: '撒料'
             }
@@ -2752,14 +2756,14 @@ export default {
         } else if (this.tab.radio == '4') {
           var excelDatas4 = [
             {
-              tHeader: ['日期','配方名称','车辆名称','开始时间','结束时间','TMR名称', '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数','混料正确数','混料正确率','去除取消正确率',  '标准差'],
-              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime','TMR名称',  '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数', '混料正确数','混料正确率','去除取消正确率', '方差'],
+              tHeader: ['日期','配方名称','车辆名称','开始加料时间','结束加料时间','TMR名称', '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','发料开始时间','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数','混料正确数','混料正确率','去除取消正确率',  '标准差'],
+              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime','TMR名称',  '车次', '班次', '驾驶员', '理论重量', '实际重量', '计划混料操作数', '已混料操作数', '混料操作率', '混料误差值', '混料准确率', '混料时间','startMaterialTime','等待时间','混料自动跳转次数', '混料手动跳转次数', '取消次数', '混料正确数','混料正确率','去除取消正确率', '方差'],
               tableDatas: this.tab.table.list,
               sheetName: '混料'
             },
             {
-              tHeader: ['日期','配方名称','车辆名称','开始时间','结束时间','TMR名称', '车次','班次', '驾驶员','理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率', '撒料时间','等待时间','撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '标准差'],
-              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime','TMR名称', '车次','班次', '驾驶员', '理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率','撒料时间','等待时间', '撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '方差'],
+              tHeader: ['日期','配方名称','车辆名称','开始加料时间','结束加料时间','TMR名称', '车次','班次', '驾驶员','理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率', '撒料时间','发料开始时间','等待时间','撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '标准差'],
+              filterVal: ['计划时间1','templetname','TMR名称','startTime','endTime','TMR名称', '车次','班次', '驾驶员', '理论重量', '实际重量', '计划撒料操作数', '已撒料操作数', '撒料操作率', '撒料误差值', '撒料准确率','撒料时间','startMaterialTime','等待时间', '撒料自动跳转次数', '撒料手动跳转次数', '取消次数','撒料正确数','撒料正确率','去除取消正确率',  '方差'],
               tableDatas: this.tab.table2.list,
               sheetName: '撒料'
             }
@@ -3027,9 +3031,11 @@ export default {
       postJson(url, data).then(response => {
         if (response.data !== null) {
           console.log('汇总统计/混料table数据', response.data.list)
+          this.$refs.plTable1.reloadData(response.data.list)
           this.tab.table.list = response.data.list
           this.tab.table.total = response.data.total
         } else {
+          this.$refs.plTable2.reloadData([])
           this.tab.table.list = []
           this.tab.table.total = 0
         }
@@ -3070,9 +3076,11 @@ export default {
       postJson(url, data).then(response => {
         if (response.data !== null) {
           console.log('汇总统计/撒料table数据', response.data.list)
+          this.$refs.plTable22.reloadData(response.data.list)
           this.tab.table2.list = response.data.list
           this.tab.table2.total = response.data.total
         } else {
+          this.$refs.plTable22.reloadData([])
           this.tab.table2.list = []
           this.tab.table2.total = 0
         }