浏览代码

JLHWEB: 1、修复复制报价时,面、底、中拆勾选时,无自动导入特殊费用

JohnnyChan 1 天之前
父节点
当前提交
2155a415b8

+ 82 - 80
JLHWEB/src/views/quote/mattressQuote/components/QuoteListNew.vue

@@ -29,67 +29,68 @@
       </div>
     </template>
 
-    <el-descriptions :column="3">
-      <template #title>
-        <span class="text-body-b">报价日期:</span>
-        <span class="text-body-b" v-if="mainData.data.createtime">{{ isFilterTime(mainData.data.createtime) }}</span>
-      </template>
-      <template #extra>
-        <template v-if="ifShowOrigin">
-          <span class="text-body-b">报价金额:</span>
-          <span class="text-body-b">{{ isFilterPrice(mainData.data.foreign_cost) + isCurrency }}</span>
+    <div class="flx-col h-full">
+      <el-descriptions :column="3" class="flx-shrink">
+        <template #title>
+          <span class="text-body-b">报价日期:</span>
+          <span class="text-body-b" v-if="mainData.data.createtime">{{ isFilterTime(mainData.data.createtime) }}</span>
         </template>
-        <template v-else>
-          <div class="flx-end">
-            <div class="ml-24" v-for="(itm, idx) in getStaticData" :key="idx">
-              <span class="text-body-b">{{ itm.label }}:</span>
-              <span class="text-body-b">{{ isFilterPrice(itm.value) }}</span>
+        <template #extra>
+          <template v-if="ifShowOrigin">
+            <span class="text-body-b">报价金额:</span>
+            <span class="text-body-b">{{ isFilterPrice(mainData.data.foreign_cost) + isCurrency }}</span>
+          </template>
+          <template v-else>
+            <div class="flx-end">
+              <div class="ml-24" v-for="(itm, idx) in getStaticData" :key="idx">
+                <span class="text-body-b">{{ itm.label }}:</span>
+                <span class="text-body-b">{{ isFilterPrice(itm.value) }}</span>
+              </div>
             </div>
-          </div>
-        </template>
-      </template>
-      <el-descriptions-item v-for="(item, idx) in fields" :key="idx" width="80">
-        <template #label>
-          <span class="text-secondary-text"> {{ item.label }}: </span>
-        </template>
-        <span class="text-body-m">{{
-          Object.keys(item).includes("value") ? item.value : isFilterPrice(mainData.data[item.field])
-        }}</span>
-      </el-descriptions-item>
-    </el-descriptions>
-
-    <template v-if="!ifShowOrigin">
-      <el-table
-        :data="tableData"
-        size="small"
-        border
-        style="width: 100%"
-        :summary-method="getSummaries"
-        :span-method="objectSpanMethod"
-      >
-        <el-table-column prop="level" label="类目" />
-        <el-table-column prop="level1" label="一级项目" />
-        <el-table-column prop="level2" label="二级项目" />
-        <template v-if="ifExpandAll">
-          <el-table-column prop="label" label="项目" />
-          <el-table-column prop="dscrp" label="内容" width="160" />
-          <el-table-column prop="qty" label="数量" align="right" />
-          <el-table-column prop="useqty" label="用量" align="right" />
-          <el-table-column prop="price" label="单价" align="right" v-if="pricePower" />
+          </template>
         </template>
-        <template v-else-if="!ifExpandAll && !pricePower">
-          <el-table-column prop="qty" label="数量" align="right" />
-          <el-table-column prop="useqty" label="用量" align="right" />
-        </template>
-        <template v-if="pricePower">
-          <el-table-column prop="costamt_2" label="标准金额" align="right" :formatter="formatter" />
-          <el-table-column prop="costamt_1" label="散单金额" align="right" :formatter="formatter" />
-          <el-table-column prop="costamt_4" label="小单金额" align="right" :formatter="formatter" />
-          <el-table-column prop="costamt_3" label="大单金额" align="right" :formatter="formatter" />
-        </template>
-      </el-table>
-
-      <!-- <vxe-table
+        <el-descriptions-item v-for="(item, idx) in fields" :key="idx" width="80">
+          <template #label>
+            <span class="text-secondary-text"> {{ item.label }}: </span>
+          </template>
+          <span class="text-body-m">{{
+            Object.keys(item).includes("value") ? item.value : isFilterPrice(mainData.data[item.field])
+          }}</span>
+        </el-descriptions-item>
+      </el-descriptions>
+
+      <template v-if="!ifShowOrigin">
+        <el-table
+          :data="tableData"
+          size="small"
+          border
+          style="width: 100%"
+          :summary-method="getSummaries"
+          :span-method="objectSpanMethod"
+        >
+          <el-table-column prop="level" label="类目" />
+          <el-table-column prop="level1" label="一级项目" />
+          <el-table-column prop="level2" label="二级项目" />
+          <template v-if="ifExpandAll">
+            <el-table-column prop="label" label="项目" />
+            <el-table-column prop="dscrp" label="内容" width="160" />
+            <el-table-column prop="qty" label="数量" align="right" />
+            <el-table-column prop="useqty" label="用量" align="right" />
+            <el-table-column prop="price" label="单价" align="right" v-if="pricePower" />
+          </template>
+          <template v-else-if="!ifExpandAll && !pricePower">
+            <el-table-column prop="qty" label="数量" align="right" />
+            <el-table-column prop="useqty" label="用量" align="right" />
+          </template>
+          <template v-if="pricePower">
+            <el-table-column prop="costamt_2" label="标准金额" align="right" :formatter="formatter" />
+            <el-table-column prop="costamt_1" label="散单金额" align="right" :formatter="formatter" />
+            <el-table-column prop="costamt_4" label="小单金额" align="right" :formatter="formatter" />
+            <el-table-column prop="costamt_3" label="大单金额" align="right" :formatter="formatter" />
+          </template>
+        </el-table>
+
+        <!-- <vxe-table
         border="full"
         ref="tableRef"
         :tree-config="treeConfig"
@@ -109,27 +110,27 @@
         <vxe-column field="useqty" title="用量"></vxe-column>
         <vxe-column field="price" title="单价"></vxe-column>
       </vxe-table> -->
-    </template>
+      </template>
 
-    <template v-else>
-      <el-table
-        :data="tableData"
-        height="100%"
-        size="small"
-        border
-        style="width: 100%"
-        show-summary
-        :summary-method="getSummaries"
-        :span-method="objectSpanMethod"
-      >
-        <el-table-column prop="label" label="项目" />
-        <el-table-column prop="dscrp" label="内容" width="160" />
-        <el-table-column prop="qty" label="数量" align="right" />
-        <el-table-column prop="costamt" label="金额" align="right" />
-        <el-table-column prop="useqty" label="用量" align="right" />
-        <el-table-column prop="price" label="单价" align="right" />
-      </el-table>
-      <!-- <el-table
+      <template v-else>
+        <el-table
+          :data="tableData"
+          height="100%"
+          size="small"
+          border
+          style="width: 100%"
+          show-summary
+          :summary-method="getSummaries"
+          :span-method="objectSpanMethod"
+        >
+          <el-table-column prop="label" label="项目" />
+          <el-table-column prop="dscrp" label="内容" width="160" />
+          <el-table-column prop="qty" label="数量" align="right" />
+          <el-table-column prop="costamt" label="金额" align="right" />
+          <el-table-column prop="useqty" label="用量" align="right" />
+          <el-table-column prop="price" label="单价" align="right" />
+        </el-table>
+        <!-- <el-table
         :data="tableData"
         size="small"
         border
@@ -151,7 +152,7 @@
         <el-table-column prop="useqty" label="用量" align="right" />
         <el-table-column prop="price" label="单价" align="right" />
       </el-table> -->
-      <!-- <el-table
+        <!-- <el-table
         ref="elTableRef"
         :data="tableData2"
         style="width: 100%; margin-bottom: 20px"
@@ -165,7 +166,8 @@
         <el-table-column prop="name" label="Name" />
         <el-table-column prop="address" label="Address" />
       </el-table> -->
-    </template>
+      </template>
+    </div>
   </LjDrawer>
 </template>
 

+ 9 - 2
JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -940,7 +940,8 @@ const {
   resetSpecialProcesses,
   gotoErpapi,
   updateSubspecsTable,
-  autoLoadExtraData
+  autoLoadExtraData,
+  autoLoadExtraData_chai
 } = useHooks(t);
 const { toExcelQuote, toExcelQuoteNew } = useHooksCpQuote();
 const { CheckPower, CheckOption, buttonNew, buttonDefault } = useAuthButtons(t);
@@ -2322,7 +2323,7 @@ onMounted(() => {
 /**
  * @description 页面数据加载完成
  */
-const funcAfterMound = async () => {
+const funcAfterMound = async (data: any) => {
   console.log("onMounted detail sale start!!!! :>> ", orderStatus.value, orderStatus.value != "new");
   if (route.fullPath.indexOf("/copy?") > -1) {
     LjDetailRef.value._mainData.mattresscode = "";
@@ -2386,6 +2387,12 @@ const funcAfterMound = async () => {
         updateSubspecsTable();
       });
 
+      if (orderStatus.value == "copy") {
+        autoLoadExtraData_chai(data.if_m_chai, "if_m_chai");
+        autoLoadExtraData_chai(data.if_z_chai, "if_z_chai");
+        autoLoadExtraData_chai(data.if_d_chai, "if_d_chai");
+      }
+
       gotoSummy();
     });
   }

+ 2 - 1
JLHWEB/src/views/quote/mattressQuote/hooks/index.tsx

@@ -6072,6 +6072,7 @@ export const useHooks = (t?: any) => {
     updateSubspecsTable,
     funcChaifenTabPro,
     getQuoteListMxData,
-    autoLoadExtraData
+    autoLoadExtraData,
+    autoLoadExtraData_chai
   };
 };

+ 1 - 1
JLHWEB/src/views/quote/mattressQuote/index.vue

@@ -701,7 +701,7 @@ const BatchCopyMattressAudited = () => {
   })
     .then(() => {
       CopyMattressAudited({ list }).then(() => {
-        ElMessage.success("复制成功!");
+        ElMessage.success("复制成功!");
         dialogFormVisible.value = false;
         vxeTableRef.value.refresh();
         loadingBtn.value = false;