JLHWEB: 1、床垫报价，报价公式数值小数保留4位；2、床垫清单-产品配置新增上、下移

JLHWEB/src/languages/modules/zh-cn/table.json

@@ -1543,6 +1543,7 @@
     "flag": "财务审核",
     "mattressname": "核价名称",
     "searchKw": "关键字",
+    "searchErpMtrl": "L1物料编码",
     "foreign_cost": "外币价",
     "bi_foreign_cost": "报价金额",
     "nottax_dept_cost": "部门不含税价",

JLHWEB/src/utils/index.ts

@@ -1249,8 +1249,9 @@ export const transformTreeData = (data: any) => {
  * @param data
  * @returns
  */
-export const isFilterPrice = data => {
-  let val = formatAmount3({ val: data });
+export const isFilterPrice = (data, digits?: number) => {
+  let _digits = digits ?? 2;
+  let val = formatAmount3({ val: data }, _digits);
   // 过滤掉末尾的0
   let arr = val.split("");
   while (arr[arr.length - 1] === "0") {

JLHWEB/src/views/erpapi/mattressInterface/detail.vue

@@ -29,8 +29,11 @@
       </LjVxeTable>
     </template>
     <template #tabNavRight="scope" v-if="orderStatus">
-      <div class="flx-center flx-end flx-1" v-if="scope.active == 'mattressQD'">
-        <LjHeaderMenu group-cls="flx-end" :action="qdAction"></LjHeaderMenu>
+      <div class="flx-center flx-end flx-1 ml-24" v-if="scope.active == 'mattressYW'">
+        <LjHeaderMenu group-cls="flx-start" :action="qdActionYW"></LjHeaderMenu>
+      </div>
+      <div class="flx-center flx-end flx-1 ml-24" v-else-if="scope.active == 'mattressQD'">
+        <LjHeaderMenu group-cls="flx-start" :action="qdAction"></LjHeaderMenu>
       </div>
     </template>
     <template #mattressQD>
@@ -198,8 +201,10 @@ const {
   JSAudit,
   JS2Audit,
   resetMergeCellsQd,
+  resetMergeCells,
   funcAddRowQd,
-  funcCmpCC
+  funcCmpCC,
+  dynamicRef
 } = useHooks(t);
 const { CheckPower, CheckOption, buttonNew, buttonDefault } = useAuthButtons(t);
 
@@ -267,8 +272,9 @@ const cellClassNameFn = (data: any, editable) => {
   return null;
 };
 
-const moveData = async (index: number, nextIndex: number) => {
-  const $table = QdTableRef.value.element;
+const moveData = async (refName: string, index: number, nextIndex: number) => {
+  const $table = dynamicRef(refName).element;
+  // const $table = QdTableRef.value.element;
   let { visibleData } = $table.getTableData();
   const curRecords = $table?.getCurrentRecord();
 
@@ -283,15 +289,24 @@ const moveData = async (index: number, nextIndex: number) => {
 
   $table.reloadData(visibleData);
   await $table.setCurrentRow(curRecords);
-  resetMergeCellsQd(() => {
-    setTimeout(() => {
-      $table.scrollToRow(curRecords);
-    }, 0);
-  });
+  if (refName == "VxeTableMxRef") {
+    resetMergeCells(() => {
+      setTimeout(() => {
+        $table.scrollToRow(curRecords);
+      }, 0);
+    });
+  } else if (refName == "QdTableRef") {
+    resetMergeCellsQd(() => {
+      setTimeout(() => {
+        $table.scrollToRow(curRecords);
+      }, 0);
+    });
+  }
 };
 
-const toMove = async (action: number) => {
-  const $table = QdTableRef.value.element;
+const toMove = async (refName: string, action: number) => {
+  // const $table = QdTableRef.value.element;
+  const $table = dynamicRef(refName).element;
   let curRecords = $table?.getCurrentRecord();
 
   let visibleData = $table.getTableData().visibleData;
@@ -310,7 +325,7 @@ const toMove = async (action: number) => {
       ElMessage.warning("已经是第一条了");
       return;
     }
-    moveData(curIdx, curIdx - 1);
+    moveData(refName, curIdx, curIdx - 1);
   } else if (action == -1) {
     // 下移
     if (curIdx == visibleData.length - 1) {
@@ -318,10 +333,41 @@ const toMove = async (action: number) => {
       return;
     }
 
-    moveData(curIdx, curIdx + 1);
+    moveData(refName, curIdx, curIdx + 1);
   }
 };
 
+const qdActionYW: detailAction[] = [
+  // buttonDefault({
+  //   label: "增行",
+  //   clickFunc: () => {
+  //     interIndex.value = -1;
+  //     LjDialogQdRowAdd.value.show();
+  //   }
+  // }),
+  // buttonDefault({
+  //   label: "插行",
+  //   divider: true,
+  //   clickFunc: () => {
+  //     const $table = QdTableRef.value.element;
+  //     const curRecords = $table?.getCurrentRecord();
+  //     if (curRecords) {
+  //       interIndex.value = $table.getRowIndex(curRecords);
+  //     }
+  //     LjDialogQdRowAdd.value.show();
+  //   }
+  // }),
+  buttonDefault({
+    label: "上移",
+    clickFunc: () => toMove("VxeTableMxRef", 1)
+  }),
+  buttonDefault({
+    label: "下移",
+    clickFunc: () => toMove("VxeTableMxRef", -1),
+    divider: true
+  })
+];
+
 const qdAction: detailAction[] = [
   buttonDefault({
     label: "增行",
@@ -332,7 +378,6 @@ const qdAction: detailAction[] = [
   }),
   buttonDefault({
     label: "插行",
-    divider: true,
     clickFunc: () => {
       const $table = QdTableRef.value.element;
       const curRecords = $table?.getCurrentRecord();
@@ -342,13 +387,27 @@ const qdAction: detailAction[] = [
       LjDialogQdRowAdd.value.show();
     }
   }),
+  // buttonDefault({
+  //   label: "删行",
+  //   divider: true,
+  //   clickFunc: () => {
+  //     ElMessageBox.prompt(`是否确定删除当前行？`, "提示", {
+  //       confirmButtonText: "确定",
+  //       cancelButtonText: "取消"
+  //     })
+  //       .then(({ value }) => {})
+  //       .catch(() => {
+  //         // ElMessage.warning("已经取消审批流程操作!");
+  //       });
+  //   }
+  // }),
   buttonDefault({
     label: "上移",
-    clickFunc: () => toMove(1)
+    clickFunc: () => toMove("QdTableRef", 1)
   }),
   buttonDefault({
     label: "下移",
-    clickFunc: () => toMove(-1),
+    clickFunc: () => toMove("QdTableRef", -1),
     divider: true
   }),
   buttonDefault({

JLHWEB/src/views/erpapi/mattressInterface/hooks/index.tsx

@@ -1769,7 +1769,7 @@ export const useHooks = (t?: any) => {
     }
   });
 
-  const resetMergeCells = () => {
+  const resetMergeCells = (cb?: any) => {
     nextTick(() => {
       const $table = state.YwTableRef.element;
       const $table2 = state.VxeTableMxRef.element;
@@ -1780,7 +1780,8 @@ export const useHooks = (t?: any) => {
       if ($table2) {
         let mergeCells = autoMergeCells($table2, ["itemname"]);
         $table2.setMergeCells(mergeCells);
-        // });
+
+        cb && cb();
       }
     });
   };
@@ -2262,6 +2263,10 @@ export const useHooks = (t?: any) => {
       });
   };
 
+  const dynamicRef = name => {
+    return state[name]; // 获取ref的值
+  };
+
   return {
     ...toRefs(state),
     columns,
@@ -2283,7 +2288,9 @@ export const useHooks = (t?: any) => {
     JSAudit,
     JS2Audit,
     resetMergeCellsQd,
+    resetMergeCells,
     funcAddRowQd,
-    funcCmpCC
+    funcCmpCC,
+    dynamicRef
   };
 };