update

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; // 库存查询 新增
 }

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

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

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) {

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,

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,