Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/dmc/manager/dmcTotalTable.vue

@@ -373,9 +373,9 @@
                   <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
-                <a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息"
-                  @click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a>
-                <a style="text-decoration:underline;cursor:pointer;display:none;" title="点击下载新餐配信息"
+                <!-- <a style="text-decoration:underline;cursor:pointer;" title="点击下载餐配信息"
+                  @click="DownLoadDinner(item)">{{$t('ground.peicanxiazai')}}</a> -->
+                <a style="text-decoration:underline;cursor:pointer;" title="点击下载新餐配信息"
                   @click="DownLoadNewDinner(item)">{{$t('ground.peicanxiazai')}}</a>
               </td>
               <td>