Bläddra i källkod

Merge remote-tracking branch 'origin/master'

yu.jie 4 år sedan
förälder
incheckning
ed77288693

+ 2 - 0
src/common/constants/buttonType.ts

@@ -102,4 +102,6 @@ export interface ButtonType {
     inventory_review_checkin_cancel: string; // 入库 撤销
     inventory_review_checkout_audit: string; // 出库 审核
     inventory_review_checkout_cancel: string; // 出库 撤销
+
+    inventory_current_add: string; // 库存查询 新增
 }

+ 1 - 3
src/services/go/ermcp/account/index.ts

@@ -60,9 +60,7 @@ export function QueryFuturesCompany(): Promise<ErmcpFuturesCompany[]> {
  * @param roleid  角色id(可多个,逗号隔开)
  * @constructor
  */
-export function QueryAccMgrRoleMenu(roleid?: string): Promise<ErmcpRoleMenuEx[]> {
-    const userid = getUserId()
-    const param = roleid ? { roleid, userid } : { userid }
+export function QueryAccMgrRoleMenu(param: { userid: number, roleid?: string }): Promise<ErmcpRoleMenuEx[]> {
     return commonSearch_go('/Ermcp/QueryAccMgrRoleMenu', param).catch((err) => {
         throw new Error(`查询账户管理角色详情: ${err.message}`);
     });

+ 1 - 2
src/views/business/purchase/components/settlement/index.vue

@@ -343,8 +343,7 @@ export default defineComponent({
                 }
                 // 调整金额 
                 if(ReckonAdjustAmount) {
-                  const temp = checkedObj.value.adjustAmount === 1 ? 1  : -1
-                  param.ReckonAdjustAmount = ReckonAdjustAmount * temp
+                  param.ReckonAdjustAmount = ReckonAdjustAmount
                 }
                 if(Remark) {
                   param.Remark = Remark

+ 1 - 2
src/views/business/sell/components/settlement/index.vue

@@ -343,8 +343,7 @@ export default defineComponent({
                 }
                 // 调整金额 
                 if(ReckonAdjustAmount) {
-                  const temp = checkedObj.value.adjustAmount === 1 ? 1  : -1
-                  param.ReckonAdjustAmount = ReckonAdjustAmount * temp
+                  param.ReckonAdjustAmount = ReckonAdjustAmount
                 }
                 if(Remark) {
                   param.Remark = Remark

+ 202 - 204
src/views/information/account_info/compoments/add-managers-permission/index.vue

@@ -1,84 +1,84 @@
 <template>
-    <!-- 新增权限模板 -->
-    <a-modal class="commonModal add-roles"
-             title="新增权限模板"
-             v-model:visible="visible"
-             @cancel="cancel"
-             centered
-             :maskClosable="false"
-             width="1230px">
-        <template #footer>
-            <a-button key="cancel"
-                      type="primary"
-                      :loading="loading"
-                      @click="cancel">取消
-            </a-button>
-            <a-button key="submit"
-                      type="primary"
-                      :loading="loading"
-                      @click="submit">新增
-            </a-button>
-        </template>
-        <a-form class="inlineForm"
-                ref="formRef"
-                :model="formState"
-                :rules="rules">
-            <a-row :gutter="24">
-                <a-col :span="24">
-                    <a-form-item label="模板名称">
-                        <a-input class="dialogInput"
-                                 style="width: 200px"
-                                 v-model:value="name"
-                                 placeholder="请输入模板名称"/>
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <a-form-item label="权限功能"
-                                 name="">
-                    </a-form-item>
-                </a-col>
-                <a-col :span="24">
-                    <div class="powerTable">
-                        <!-- <a-checkbox-group class="commonCheckboxGroup"
+  <!-- 新增权限模板 -->
+  <a-modal class="commonModal add-roles"
+           title="新增权限模板"
+           v-model:visible="visible"
+           @cancel="cancel"
+           centered
+           :maskClosable="false"
+           width="1230px">
+    <template #footer>
+      <a-button key="cancel"
+                type="primary"
+                :loading="loading"
+                @click="cancel">取消
+      </a-button>
+      <a-button key="submit"
+                type="primary"
+                :loading="loading"
+                @click="submit">新增
+      </a-button>
+    </template>
+    <a-form class="inlineForm"
+            ref="formRef"
+            :model="formState"
+            :rules="rules">
+      <a-row :gutter="24">
+        <a-col :span="24">
+          <a-form-item label="模板名称">
+            <a-input class="dialogInput"
+                     style="width: 200px"
+                     v-model:value="name"
+                     placeholder="请输入模板名称" />
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <a-form-item label="权限功能"
+                       name="">
+          </a-form-item>
+        </a-col>
+        <a-col :span="24">
+          <div class="powerTable">
+            <!-- <a-checkbox-group class="commonCheckboxGroup"
 
                                          > -->
-                        <div class="powerRow"
-                             v-for="(item, i) in tableList"
-                             :key="i + '0'">
-                            <div class="powerLeft">
-                                <a-checkbox v-model:checked="item.Menu.ishadrole">
-                                    {{item.Menu.resourcename}}
-                                </a-checkbox>
-                            </div>
-                            <div class="powerRight">
-                                <div class="line"
-                                     v-for="(sub, j) in item.SubMenu"
-                                     :key="j + '1'">
-                                    <div class="left">
-                                        <a-checkbox v-model:checked="sub.Menu.ishadrole"
-                                                    @change="secondChange(item, sub)"
-                                                    :value="sub.Menu.resourcecode">
-                                            {{sub.Menu.resourcename}}
-                                        </a-checkbox>
-                                    </div>
-                                    <div class="right">
-                                        <a-checkbox v-for="(subNext, l) in sub.SubMenu"
-                                                    :key="l + '3'"
-                                                    v-model:checked="subNext.Menu.ishadrole"
-                                                    @change="thirdChange(item, sub, subNext)"
-                                                    :value="subNext.Menu.resourcecode">
-                                            {{subNext.Menu.resourcename}}
-                                        </a-checkbox>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                        <!-- </a-checkbox-group> -->
-                    </div>
-                </a-col>
-            </a-row>
-        </a-form>
-    </a-modal>
+            <div class="powerRow"
+                 v-for="(item, i) in tableList"
+                 :key="i + '0'">
+              <div class="powerLeft">
+                <a-checkbox v-model:checked="item.Menu.ishadrole">
+                  {{item.Menu.resourcename}}
+                </a-checkbox>
+              </div>
+              <div class="powerRight">
+                <div class="line"
+                     v-for="(sub, j) in item.SubMenu"
+                     :key="j + '1'">
+                  <div class="left">
+                    <a-checkbox v-model:checked="sub.Menu.ishadrole"
+                                @change="secondChange(item, sub)"
+                                :value="sub.Menu.resourcecode">
+                      {{sub.Menu.resourcename}}
+                    </a-checkbox>
+                  </div>
+                  <div class="right">
+                    <a-checkbox v-for="(subNext, l) in sub.SubMenu"
+                                :key="l + '3'"
+                                v-model:checked="subNext.Menu.ishadrole"
+                                @change="thirdChange(item, sub, subNext)"
+                                :value="subNext.Menu.resourcecode">
+                      {{subNext.Menu.resourcename}}
+                    </a-checkbox>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <!-- </a-checkbox-group> -->
+          </div>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
 </template>
 
 <script lang="ts">
@@ -106,9 +106,8 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading).then((res) => {
-                        console.log('res', res);
-
+                    const param = {userid: getUserId(), roleid: '0'}
+                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;
                     });
                 }
@@ -190,157 +189,156 @@
 </script>
 
 <style lang="less">
-    .add-roles {
-        .ant-modal-content {
-            .ant-modal-body {
-                overflow-x: hidden;
-            }
+.add-roles {
+    .ant-modal-content {
+        .ant-modal-body {
+            overflow-x: hidden;
         }
+    }
 
-        .powerTable {
-            width: 100%;
-            height: 100%;
-            border: 3px solid @m-grey11;
-            background-color: @m-black12;
-            font-size: 14px;
-            color: @m-white0;
-            .flex;
-            flex-direction: column;
-            overflow-x: auto;
-            overflow-y: hidden;
+    .powerTable {
+        width: 100%;
+        height: 100%;
+        border: 3px solid @m-grey11;
+        background-color: @m-black12;
+        font-size: 14px;
+        color: @m-white0;
+        .flex;
+        flex-direction: column;
+        overflow-x: auto;
+        overflow-y: hidden;
 
-            .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
-                width: 120px;
+        .ant-checkbox-group.commonCheckboxGroup .ant-checkbox-wrapper {
+            width: 120px;
 
-                span + span {
-                    margin-right: 0;
-                }
+            span + span {
+                margin-right: 0;
             }
+        }
 
-            .powerRow {
-                width: 100%;
-                display: inline-flex;
-                border-bottom: 3px solid @m-grey11;
-
-                > div {
-                    align-self: center;
-                    align-items: center;
-                    white-space: nowrap;
-                    line-height: 40px;
-                }
+        .powerRow {
+            width: 100%;
+            display: inline-flex;
+            border-bottom: 3px solid @m-grey11;
 
-                .powerLeft {
-                    width: 120px;
-                    padding: 0 8px;
-                }
+            > div {
+                align-self: center;
+                align-items: center;
+                white-space: nowrap;
+                line-height: 40px;
+            }
 
-                .powerRight {
-                    flex: 1;
-                    max-width: calc(100% - 120px);
-                    .flex;
-                    flex-direction: column;
+            .powerLeft {
+                width: 120px;
+                padding: 0 8px;
+            }
 
-                    .line {
-                        width: 100%;
-                        display: inline-flex;
-                        border-bottom: 3px solid @m-grey11;
+            .powerRight {
+                flex: 1;
+                max-width: calc(100% - 120px);
+                .flex;
+                flex-direction: column;
 
-                        > div {
-                            padding: 0 8px;
-                        }
+                .line {
+                    width: 100%;
+                    display: inline-flex;
+                    border-bottom: 3px solid @m-grey11;
 
-                        .left {
-                            width: 140px;
-                            min-width: 140px;
-                            border-left: 3px solid @m-grey11;
-                            border-right: 3px solid @m-grey11;
-                        }
+                    > div {
+                        padding: 0 8px;
+                    }
 
-                        .right {
-                            flex: 1;
-                            width: calc(100% - 120px);
-                        }
+                    .left {
+                        width: 140px;
+                        min-width: 140px;
+                        border-left: 3px solid @m-grey11;
+                        border-right: 3px solid @m-grey11;
                     }
 
-                    .line:last-child {
-                        border-bottom: 0;
+                    .right {
+                        flex: 1;
+                        width: calc(100% - 120px);
                     }
                 }
 
-                // .powerMiddle {
-                //     width: 180px;
-                //     .flex;
-                //     flex-direction: column;
-                //     div {
-                //         width: 100%;
-                //         height: 40px;
-                //         line-height: 40px;
-                //         padding: 0 8px;
-                //         border: 3px solid @m-grey11;
-                //         border-top: 0;
-                //     }
-                //     div:last-child {
-                //         border-bottom: 0;
-                //     }
-                // }
-                // .powerRight {
-                //     flex: 1;
-                //     .flex;
-                //     flex-direction: column;
-                //     div {
-                //         width: 100%;
-                //         height: 40px;
-                //         line-height: 40px;
-                //         padding: 0 8px;
-                //         justify-content: flex-start;
-                //         border-bottom: 3px solid @m-grey11;
-                //     }
-                //     div:last-child {
-                //         border-bottom: 0;
-                //     }
-                // }
+                .line:last-child {
+                    border-bottom: 0;
+                }
             }
+
+            // .powerMiddle {
+            //     width: 180px;
+            //     .flex;
+            //     flex-direction: column;
+            //     div {
+            //         width: 100%;
+            //         height: 40px;
+            //         line-height: 40px;
+            //         padding: 0 8px;
+            //         border: 3px solid @m-grey11;
+            //         border-top: 0;
+            //     }
+            //     div:last-child {
+            //         border-bottom: 0;
+            //     }
+            // }
+            // .powerRight {
+            //     flex: 1;
+            //     .flex;
+            //     flex-direction: column;
+            //     div {
+            //         width: 100%;
+            //         height: 40px;
+            //         line-height: 40px;
+            //         padding: 0 8px;
+            //         justify-content: flex-start;
+            //         border-bottom: 3px solid @m-grey11;
+            //     }
+            //     div:last-child {
+            //         border-bottom: 0;
+            //     }
+            // }
         }
-        .ant-checkbox-wrapper {
-            color: @m-white0;
-            font-size: 14px;
-            .ant-checkbox {
-                margin-right: 2px;
-                .ant-checkbox-inner {
-                    background: #15202B;
-                    border: 1px solid #2B3F52;
-                    border-radius: 3px;
-                }
+    }
+    .ant-checkbox-wrapper {
+        color: @m-white0;
+        font-size: 14px;
+        .ant-checkbox {
+            margin-right: 2px;
+            .ant-checkbox-inner {
+                background: #15202b;
+                border: 1px solid #2b3f52;
+                border-radius: 3px;
             }
-            .ant-checkbox.ant-checkbox-checked {
-                .ant-checkbox-inner {
-                    &::after {
-                        border-color: #3A87F7;
-                    }
-                }
+        }
+        .ant-checkbox.ant-checkbox-checked {
+            .ant-checkbox-inner {
                 &::after {
-                    border-color: #3A87F7;
+                    border-color: #3a87f7;
                 }
             }
-            span+span {
-                margin-right: 15px;
+            &::after {
+                border-color: #3a87f7;
+            }
+        }
+        span + span {
+            margin-right: 15px;
+            color: @m-white0;
+            font-size: 14px;
+        }
+    }
+    .ant-checkbox-wrapper-disabled {
+        .ant-checkbox-disabled {
+            outline-color: #2b3f52;
+            .ant-checkbox-input {
                 color: @m-white0;
                 font-size: 14px;
             }
-        }
-        .ant-checkbox-wrapper-disabled {
-            .ant-checkbox-disabled {
-                outline-color: #2B3F52;
-                .ant-checkbox-input {
-                    color: @m-white0;
-                    font-size: 14px;
-                }
-                .ant-checkbox-inner {
-                    border-color: #2B3F52 !important;
-                }
+            .ant-checkbox-inner {
+                border-color: #2b3f52 !important;
             }
         }
-        
     }
+}
 </style
 >;

+ 12 - 7
src/views/information/account_info/compoments/managers-permission-delete/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- 新增权限模板 -->
+  <!-- 删除权限模板 -->
   <a-modal class="commonModal add-roles"
            title="删除权限模板"
            v-model:visible="visible"
@@ -16,7 +16,7 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">修改
+                @click="submit">删除
       </a-button>
     </template>
     <a-form class="inlineForm"
@@ -43,7 +43,8 @@
                  v-for="(item, i) in tableList"
                  :key="i + '0'">
               <div class="powerLeft">
-                <a-checkbox v-model:checked="item.Menu.ishadrole">
+                <a-checkbox v-model:checked="item.Menu.ishadrole"
+                            disabled>
                   {{item.Menu.resourcename}}
                 </a-checkbox>
               </div>
@@ -54,7 +55,8 @@
                   <div class="left">
                     <a-checkbox v-model:checked="sub.Menu.ishadrole"
                                 @change="secondChange(item, sub)"
-                                :value="sub.Menu.resourcecode">
+                                :value="sub.Menu.resourcecode"
+                                disabled>
                       {{sub.Menu.resourcename}}
                     </a-checkbox>
                   </div>
@@ -63,7 +65,8 @@
                                 :key="l + '3'"
                                 v-model:checked="subNext.Menu.ishadrole"
                                 @change="thirdChange(item, sub, subNext)"
-                                :value="subNext.Menu.resourcecode">
+                                :value="subNext.Menu.resourcecode"
+                                disabled>
                       {{subNext.Menu.resourcename}}
                     </a-checkbox>
                   </div>
@@ -108,10 +111,12 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading).then((res) => {
+                    const { modifiername, areauserid, autoid} = props.selectedData;
+                    name.value = modifiername
+                    const param = {userid: areauserid, roleid: autoid.toString()}
+                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;
                     });
-                    name.value = props.selectedData.modifiername
                 }
             });
 

+ 11 - 11
src/views/information/account_info/compoments/managers-permission-detail/index.vue

@@ -11,12 +11,7 @@
       <a-button key="cancel"
                 type="primary"
                 :loading="loading"
-                @click="cancel">取消
-      </a-button>
-      <a-button key="submit"
-                type="primary"
-                :loading="loading"
-                @click="submit">删除
+                @click="cancel">完成
       </a-button>
     </template>
     <a-form class="inlineForm"
@@ -43,7 +38,8 @@
                  v-for="(item, i) in tableList"
                  :key="i + '0'">
               <div class="powerLeft">
-                <a-checkbox v-model:checked="item.Menu.ishadrole">
+                <a-checkbox v-model:checked="item.Menu.ishadrole"
+                            disabled>
                   {{item.Menu.resourcename}}
                 </a-checkbox>
               </div>
@@ -54,7 +50,8 @@
                   <div class="left">
                     <a-checkbox v-model:checked="sub.Menu.ishadrole"
                                 @change="secondChange(item, sub)"
-                                :value="sub.Menu.resourcecode">
+                                :value="sub.Menu.resourcecode"
+                                disabled>
                       {{sub.Menu.resourcename}}
                     </a-checkbox>
                   </div>
@@ -63,7 +60,8 @@
                                 :key="l + '3'"
                                 v-model:checked="subNext.Menu.ishadrole"
                                 @change="thirdChange(item, sub, subNext)"
-                                :value="subNext.Menu.resourcecode">
+                                :value="subNext.Menu.resourcecode"
+                                disabled>
                       {{subNext.Menu.resourcename}}
                     </a-checkbox>
                   </div>
@@ -108,10 +106,12 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading).then((res) => {
+                    const { modifiername, areauserid, autoid} = props.selectedData;
+                    name.value = modifiername
+                    const param = {userid: areauserid, roleid: autoid.toString()}
+                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;
                     });
-                    name.value = props.selectedData.modifiername
                 }
             });
 

+ 4 - 2
src/views/information/account_info/compoments/managers-permission-modify/index.vue

@@ -109,8 +109,10 @@
             const name = ref<string>('')
             watchEffect(() => {
                 if (visible.value) {
-                    name.value = props.selectedData.modifiername
-                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading).then((res) => {
+                    const { modifiername, areauserid, autoid} = props.selectedData;
+                    name.value = modifiername
+                    const param = {userid: areauserid, roleid: autoid.toString()}
+                    queryResultLoadingAndInfo(QueryAccMgrRoleMenu, loading, param).then((res) => {
                         tableList.value = res;
                     });
                 }

+ 2 - 0
src/views/information/account_info/compoments/managers-permission/index.vue

@@ -82,6 +82,8 @@ export default defineComponent({
         
         function queryTable() {
              queryResultLoadingAndInfo(QueryAccMgrRole, loading).then((res) => {
+                 console.log(res);
+                 
                     tableList.value = res.map((e: ErmcpRole, i: number) => Object.assign(e, {key: `${i}`}))
                 });
         }

+ 1 - 1
src/views/manage/finance-review/components/invoiceCancel/index.vue

@@ -11,7 +11,7 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">关闭
+                @click="cancel">关闭
       </a-button>
 
       <a-button key="submit"

+ 1 - 1
src/views/manage/inventory-review/components/checkoutCancel/index.vue

@@ -11,7 +11,7 @@
       <a-button key="submit"
                 type="primary"
                 :loading="loading"
-                @click="submit">关闭
+                @click="cancel">关闭
       </a-button>
 
       <a-button key="submit"

+ 1 - 1
src/views/search/inventory/components/add/index.vue

@@ -37,7 +37,7 @@ export default defineComponent({
         },
     },
     setup(props, context) {
-        const { visible, cancel } = closeModal('spot_contract_btn_add');
+        const { visible, cancel } = closeModal('inventory_current_add');
 
         const loading = ref<boolean>(false);
         function submit(OperateType: 1 | 2) {

+ 8 - 7
src/views/search/inventory/list/inventory_applyrecord/index.vue

@@ -3,9 +3,9 @@
   <div class="inventory_current"
        :loading="loading">
     <Filter @search="search">
-      <BtnList :btnList="commonBtn" />
+      <BtnList :btnList="firstBtn" />
     </Filter>
-    <contextMenu :contextMenuList="forDataBtn">
+    <contextMenu :contextMenuList="secondBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
                :pagination="false"
@@ -15,7 +15,7 @@
                :data-source="tableList">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
+          <BtnList :btnList="secondBtn" />
         </template>
         <!-- <template #userinfotype="{ text }">
                   <a>{{ text === '2' ? '企业' : '个人'}}</a>
@@ -46,7 +46,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import Filter from '../../components/filterTable/index.vue';
 import Add from '../../components/add/index.vue';
 
@@ -67,7 +67,8 @@ export default defineComponent({
         // 表格事件
         const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<Ermcp3AreaStockApply>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('inventory_applyrecord', false);
+        const [firstBtn, secondBtn] = _getBtnList('inventory_applyrecord', false).value;
+        
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList();
 
@@ -90,8 +91,8 @@ export default defineComponent({
             expandedRowKeys,
             selectedRow,
             Rowclick,
-            commonBtn,
-            forDataBtn,
+            firstBtn,
+            secondBtn,
             loading,
             tableList,
             search,

+ 7 - 7
src/views/search/inventory/list/inventory_current/index.vue

@@ -3,9 +3,9 @@
   <div class="inventory_current"
        :loading="loading">
     <Filter @search="search">
-      <BtnList :btnList="commonBtn" />
+      <BtnList :btnList="firstBtn" />
     </Filter>
-    <contextMenu :contextMenuList="forDataBtn">
+    <contextMenu :contextMenuList="secondBtn">
       <a-table :columns="columns"
                class="topTable hiddenFirstCol"
                :pagination="false"
@@ -15,7 +15,7 @@
                :data-source="tableList">
         <!-- 额外的展开行 -->
         <template #expandedRowRender="{  }">
-          <BtnList :btnList="forDataBtn" />
+          <BtnList :btnList="secondBtn" />
         </template>
       </a-table>
     </contextMenu>
@@ -25,7 +25,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList } from '@/common/export/table';
+import { defineComponent, initData, getTableColumns, getTableEvent, getBtnList, contextMenu, BtnList, _getBtnList } from '@/common/export/table';
 import Filter from '../../components/filterTable/index.vue';
 import Add from '../../components/add/index.vue';
 
@@ -46,7 +46,7 @@ export default defineComponent({
         // 表格事件
         const { expandedRowKeys, selectedRow, Rowclick } = getTableEvent<Ermcp3AreaStock>({});
         // 表格操作按钮列表
-        const { commonBtn, forDataBtn } = getBtnList('inventory_current', false);
+        const [firstBtn, secondBtn] = _getBtnList('inventory_current', false).value;
         // 表格列表数据
         const { loading, tableList, queryTable } = queryTableList();
 
@@ -69,8 +69,8 @@ export default defineComponent({
             expandedRowKeys,
             selectedRow,
             Rowclick,
-            commonBtn,
-            forDataBtn,
+            firstBtn,
+            secondBtn,
             loading,
             tableList,
             search,