Ver código fonte

电量管理增加角色degree-manage

hfxc226 2 dias atrás
pai
commit
bc04610973
1 arquivos alterados com 16 adições e 13 exclusões
  1. 16 13
      src/views/produce/report/ProduceReport.vue

+ 16 - 13
src/views/produce/report/ProduceReport.vue

@@ -62,7 +62,7 @@
                   :disabled-date="disabledDate"
                   style="width: 100%"
                   :format="BaseTool.Date.PICKER_NORM_DATE_PATTERN"
-                  v-model="queryParam.date" />
+                  v-model="queryParam.date"/>
               </a-form-item>
             </a-col>
           </a-row>
@@ -73,7 +73,7 @@
                 <a-button style="margin-left: 8px" @click="resetSearchForm">重置</a-button>
                 <a @click="()=>{ this.advanced = !this.advanced}" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
-                  <a-icon :type="advanced ? 'up' : 'down'" />
+                  <a-icon :type="advanced ? 'up' : 'down'"/>
                 </a>
               </span>
             </a-col>
@@ -92,23 +92,26 @@
               icon="download"
               @click="doExport">导出
             </a-button>
-            <a-button
-              style="margin-left: 8px"
-              v-if="$auth('produce-reports-add')"
-              type="primary"
-              @click="handleGenerate()">重新生成
-            </a-button>
             <a-dropdown v-action:edit v-if="selectedRowKeys.length > 0 && $auth('produce-reports-del')">
               <a-menu slot="overlay">
                 <a-popconfirm title="是否要删除所选数据?" @confirm="batchDelete()">
                   <a-menu-item key="1">
-                    <a-icon type="delete" />
-                    <a>删除</a></a-menu-item>
+                    <a-icon type="delete"/>
+                    <a>删除</a>
+                  </a-menu-item>
+                </a-popconfirm>
+              </a-menu>
+              <a-menu slot="overlay">
+                <a-popconfirm title="是否要重新生成?" @confirm="handleGenerate()">
+                  <a-menu-item key="2">
+                    <a-icon/>
+                    <a>重新生成</a>
+                  </a-menu-item>
                 </a-popconfirm>
               </a-menu>
               <a-button style="margin-left: 8px">
                 批量操作
-                <a-icon type="down" />
+                <a-icon type="down"/>
               </a-button>
             </a-dropdown>
           </a-col>
@@ -141,8 +144,8 @@
         </span>
       </s-table>
     </div>
-    <base-form ref="baseModal" @ok="handleOk" />
-    <detail ref="detailModal" @ok="handleOk" />
+    <base-form ref="baseModal" @ok="handleOk"/>
+    <detail ref="detailModal" @ok="handleOk"/>
   </a-card>
 </template>