JLHWEB: 补充提交

JLHWEB/src/api/interface/index.ts

@@ -1195,6 +1195,9 @@ export namespace Basicinfo {
 }
 
 export namespace SalePrice {
+  export interface ReqPriceList {
+    inuse?: number;
+  }
   export interface ResPriceList {
     list: any[];
   }
@@ -1316,6 +1319,11 @@ export namespace Mattress {
   export interface ReqGetResetWiptype {
     qdList: any[];
   }
+  export interface ResUpdateL1Basicinfo {
+    mtrlnum: number;
+    wkgnum: number;
+    mtrltypenum: number;
+  }
   export interface ReqMattressImport {
     mattressid?: number;
     mattresstypeid: number;

JLHWEB/src/api/modules/quote.ts

@@ -188,5 +188,5 @@ export const GetResetWiptype = (params: Mattress.ReqGetResetWiptype) => {
  * @name 同步L1基础信息
  */
 export const UpdateL1Basicinfo = () => {
-  return http.post(PORT1 + `/UpdateL1Basicinfo`, {});
+  return http.post<Mattress.ResUpdateL1Basicinfo>(PORT1 + `/UpdateL1Basicinfo`, {});
 };

JLHWEB/src/api/modules/saleprice.ts

@@ -3,8 +3,8 @@ import { CommonDynamicSelect } from "@/api/modules/common";
 import { PORT1 } from "@/api/config/servicePort";
 import http from "@/api";
 
-export const getPriceList = () => {
-  return http.post<SalePrice.ResPriceList>(PORT1 + `/GetPriceList`, {});
+export const getPriceList = (params?: SalePrice.ReqPriceList) => {
+  return http.post<SalePrice.ResPriceList>(PORT1 + `/GetPriceList`, params ?? {});
 };
 
 export const AuditPriceList = (params: SalePrice.ReqAuditSalePrice) => {

JLHWEB/src/views/baseinfo/mtrldef/hooks/index.tsx

@@ -333,7 +333,7 @@ export const useHooks = (t?: any) => {
       visible: false,
       // limited: true,
       enum: async () => {
-        const data = (await getPriceList()).list;
+        const data = (await getPriceList({ inuse: 0 })).list;
         state.priceListEnum = data;
         return { data };
       },

JLHWEB/src/views/baseinfo/shrinkage/index.vue

@@ -38,7 +38,7 @@
     </template>
     <div class="flx-1 h-full">
       <LjHeaderMenu :data="mainData" :action="orderStatus ? orderEditAction : orderDefaultAction" />
-      <!-- <Detail class="flx-1" :data="mainData" :status="orderStatus" :enum="enumMap" /> -->
+      <Detail class="flx-1" :data="mainData" :status="orderStatus" :enum="enumMap" />
     </div>
   </LjDialog>
 </template>

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

@@ -124,7 +124,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useHooks } from "./hooks/index";
 import { useAuthButtons } from "@/hooks/useAuthButtons";
 import { CommonDynamicSelect, GetERPWrkGrpList, GetERPWrkGrpList2 } from "@/api/modules/common";
-import { SaveMattressInterface, GetResetWiptype } from "@/api/modules/quote";
+import { SaveMattressInterface, GetResetWiptype, UpdateL1Basicinfo } from "@/api/modules/quote";
 import { ElMessage, ElMessageBox, ElNotification } from "element-plus";
 import mittBus from "@/utils/mittBus";
 import { MittEnum } from "@/enums/mittEnum";
@@ -234,7 +234,8 @@ const detailProps = reactive<DetailProp>({
 
 const tabRemove: Function = inject("tabRemove") as Function;
 const loadingStatus = reactive({
-  save: false
+  save: false,
+  synchsL1: false
 });
 
 const cellClassNameFn = (data: any, editable) => {
@@ -869,6 +870,31 @@ const orderDefaultAction = [
     //   }
     // })
   ],
+  buttonDefault({
+    label: "同步L1资料",
+    // limited: () => {
+    //   return !orderStatus.value;
+    // },
+    loading: () => loadingStatus.synchsL1,
+    clickFunc: async () => {
+      try {
+        loadingStatus.synchsL1 = true;
+        let res = await UpdateL1Basicinfo();
+        if (res) {
+          ElNotification({
+            title: "同步成功",
+            message: `物料：${res.mtrlnum}个 <br/>工组：${res.wkgnum}个 <br/>物料类别：${res.mtrltypenum}个`,
+            dangerouslyUseHTMLString: true,
+            type: "warning"
+          });
+        }
+        loadingStatus.synchsL1 = false;
+      } catch (error) {
+        loadingStatus.synchsL1 = false;
+        console.error(error);
+      }
+    }
+  }),
   buttonDefault({
     label: t("common.back"),
     clickFunc: item => {

JLHWEB/src/views/quote/bednetQuote/components/FormulaItem.vue

@@ -130,9 +130,9 @@ const RenderVariable = (data: any, rprops: any) => {
 
   let _value = "";
   if (sumVal) {
-    // _value = isFilterPrice(sumVal.value);
+    _value = isFilterPrice(sumVal.value);
     // if (Number(_value) == 0) {
-    _value = sumVal.value;
+    // _value = sumVal.value;
     // }
     let isFormulaValue = props.formula.some(o => o.label.indexOf(fieldName) > -1);
     if (isFormulaValue) {