JohnnyChan 2 mesiacov pred
rodič
commit
24db62c489
1 zmenil súbory, kde vykonal 46 pridanie a 18 odobranie
  1. 46 18
      JLHWEB/src/views/quote/mattressQuote/detail.vue

+ 46 - 18
JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -13,15 +13,30 @@
     :default-columns-value="defaultColumnsValue"
   >
     <template #rightBtn="scope">
-      <el-select v-model="scope.data.dannum_rate" placeholder="大小单" style="width: 80px">
-        <el-option label="散单" :value="1" />
-        <el-option label="标准" :value="2" />
-        <el-option label="大单" :value="3" />
-        <el-option label="小单" :value="4" />
-      </el-select>
+      <el-space warp>
+        <el-checkbox
+          v-model="isShowOriginFormulaMattress"
+          v-if="CheckPower(131)"
+          label="显示旧公式"
+          size="small"
+          @change="showOriginFormulaMattress"
+        />
+        <el-select v-model="scope.data.dannum_rate" placeholder="大小单" style="width: 80px">
+          <el-option label="散单" :value="1" />
+          <el-option label="标准" :value="2" />
+          <el-option label="大单" :value="3" />
+          <el-option label="小单" :value="4" />
+        </el-select>
+      </el-space>
     </template>
     <template #headerSuffix>
-      <Statistic :data="cmpFormulaReplace" :precision="2" @click="gotoShowFormula" />
+      <Statistic
+        :data="cmpFormulaReplace"
+        :dataorigin="cmpFormulaReplaceOri"
+        :iforigin="isShowOriginFormulaMattress"
+        :precision="2"
+        @click="gotoShowFormula"
+      />
     </template>
     <!-- @to-pin-detail="emit('toPinDetail')" -->
     <template #fabricMx__tabtitle="scope">
@@ -749,15 +764,8 @@
 
   <MtrldefDialog ref="MtrldefDialogRef" v-bind="MtrldefDialogProps" />
   <BednetDialog ref="BednetDialogRef" v-bind="BednetDialogProps" />
-  <LjDrawerQuoteList
-    ref="QuoteListDrawerRef"
-    :data="LjDetailRef && LjDetailRef._mainData"
-    :mxdata="isQuoteListMxData"
-    :enumMap="LjDetailRef && LjDetailRef.enumMap"
-    :fabricMx="fabricMxTabList"
-    :formulakindenum="formulaKindEnum"
-  />
-  <AllFormula ref="AllFormulaRef" />
+  <LjDrawerQuoteList ref="QuoteListDrawerRef" :iforigin="isShowOriginFormulaMattress" />
+  <AllFormula ref="AllFormulaRef" :iforigin="isShowOriginFormulaMattress" />
 
   <LjDrawer ref="LjDrawerRef" class="lj-drawer-win" size="80%" direction="btt" :title="drawerTitle">
     <BednetDetail
@@ -827,6 +835,11 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const globalStore = useGlobalStore();
+// const { isShowOriginFormulaMattress } = storeToRefs(globalStore);
+
+const showOriginFormulaMattress = (value: any) => {
+  globalStore.setGlobalState("isShowOriginFormulaMattress", Boolean(value));
+};
 
 const _variables: any = variables;
 const {
@@ -886,6 +899,8 @@ const {
   LjDrawerRef,
   cmpFormulas,
   cmpFormulaReplace,
+  cmpFormulasOri,
+  cmpFormulaReplaceOri,
   subSpecsRef,
   columnsMx_subSpecs,
   diancengAreaEnum,
@@ -895,6 +910,7 @@ const {
   additionalCostsMxData,
   specialProcessesEnum,
   additionalCostsEnum,
+  isShowOriginFormulaMattress,
   funcAddMxSide,
   funcChaifenTab,
   getData_mx,
@@ -1544,7 +1560,12 @@ const getData = (params: any) => {
 };
 
 const gotoShowFormula = () => {
-  AllFormulaRef.value.open(cmpFormulas.value, cmpFormulaReplace.value);
+  AllFormulaRef.value.open({
+    formula: cmpFormulas.value,
+    replace: cmpFormulaReplace.value,
+    formula_ori: cmpFormulasOri.value,
+    replace_ori: cmpFormulaReplaceOri.value
+  });
 };
 
 const loadingStatus = reactive({
@@ -2021,7 +2042,14 @@ const orderDefaultAction = [
   buttonDefault({
     label: t("common.showQuoteList"),
     clickFunc: item => {
-      QuoteListDrawerRef.value.show();
+      let _data = {
+        data: LjDetailRef.value._mainData,
+        mxdata: isQuoteListMxData.value,
+        enumMap: LjDetailRef.value.enumMap,
+        fabricMx: fabricMxTabList.value,
+        formulakindenum: formulaKindEnum.value
+      };
+      QuoteListDrawerRef.value.show(_data, cmpFormulaReplaceOri.value);
     }
   }),
   buttonDefault({