Browse Source

修改原始记录合计显示问题

zhangafei 1 week ago
parent
commit
86628eca77

+ 4 - 4
.env.development

@@ -5,15 +5,15 @@ VITE_USE_MOCK = false
 VITE_PUBLIC_PATH = /
 
 # 跨域代理,您可以配置多个 ,请注意,没有换行符
-VITE_PROXY = [["/jeecgboot","http://192.168.1.53:9999"],["/upload","http://localhost:3300/upload"]]
-# VITE_PROXY = [["/jeecgboot","http://192.168.1.6:9999"],["/upload","http://localhost:3300/upload"]]
+# VITE_PROXY = [["/jeecgboot","http://192.168.1.53:9999"],["/upload","http://localhost:3300/upload"]]
+VITE_PROXY = [["/jeecgboot","http://192.168.1.6:9999"],["/upload","http://localhost:3300/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://192.168.0.119:9999"],["/upload","http://localhost:3300/upload"]]
 # VITE_PROXY = [["/jeecgboot","http://123.57.213.14:9898"],["/upload","http://localhost:3300/upload"]]
 
 #后台接口全路径地址(必填)
 # VITE_GLOB_DOMAIN_URL=http://localhost:9999
-# VITE_GLOB_DOMAIN_URL=http://192.168.1.6:9999
-VITE_GLOB_DOMAIN_URL=http://192.168.1.53:9999
+VITE_GLOB_DOMAIN_URL=http://192.168.1.6:9999
+# VITE_GLOB_DOMAIN_URL=http://192.168.1.53:9999
 # VITE_GLOB_DOMAIN_URL=http://192.168.0.119:9999
 # VITE_GLOB_DOMAIN_URL=http://123.57.213.14:9898
 

+ 8 - 6
src/views/billet/operator/components/orgData.vue

@@ -33,7 +33,8 @@
           <a-table-summary-row class="summary-row-no-border">
             <a-table-summary-cell :row-span="2" :col-span="remakeColSpan">
               <div class="summary-cell-remark">
-                <a-textarea v-model:value="mainRemark" @blur="handleRemarkBlur" style="min-height: 160px" :bordered="false" />
+                <a-textarea v-model:value="mainRemark" @blur="handleRemarkBlur" style="min-height: 160px; padding-top: 0" :bordered="false" />
+                <div style="text-align: left; padding: 0 11px">{{ totalWeight }}</div>
               </div>
             </a-table-summary-cell>
             <a-table-summary-cell :row-span="1" :col-span="1"> 热送 </a-table-summary-cell>
@@ -580,7 +581,7 @@
   const mainSize = ref('');
   const mainOrgRemark = ref('');
   const mainRemark = ref('');
-
+  const totalWeight = ref('');
   const getHeatList = async (params, isInit?: boolean) => {
     if (isInit !== true) {
       setTimeout(() => {
@@ -1094,9 +1095,10 @@
 
         let allWeight = 0;
         // 热送统计
+        const sendKey = hostNumber.value == '5' ? '一' : '高';
         if (Object.values(rollOneSize).length) {
-          hotSendList.value['一'] = Object.values(rollOneSize);
-          hotSendList.value['一'].forEach((ele) => (allWeight += ele.weight));
+          hotSendList.value[sendKey] = Object.values(rollOneSize);
+          hotSendList.value[sendKey].forEach((ele) => (allWeight += ele.weight));
         }
         if (Object.values(rollOneHotAndColdSize['0']['roll_club_two']).length) {
           hotSendList.value['二'] = Object.values(rollOneHotAndColdSize['0']['roll_club_two']);
@@ -1144,10 +1146,10 @@
         emits('statistics', {
           chargeList: rollChargeSizeType,
           stackingList: stackingList.value,
-          hotSendList: hotSendList.value['一'],
+          hotSendList: hotSendList.value[sendKey],
         });
-        mainRemark.value = `合计:${allWeight.toFixed(3)} t`;
 
+        totalWeight.value = `合计:${allWeight.toFixed(3)} t`;
         dataSource.value = dataOrgSource;
       }
       start();

+ 22 - 36
src/views/billet/operator/components/printBilletSampleCard.vue

@@ -25,68 +25,52 @@
           <a-descriptions-item label="序号" :labelStyle="labelStyle" :contentStyle="contentStyle">炉号</a-descriptions-item>
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="contentStyle">钢种</a-descriptions-item>
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
-            <div class="size-items-title">
-              定尺&nbsp;&nbsp;&nbsp;&nbsp;
-              <span class="s-txt">{{ sizeArrs[0] ? '170' : '' }}</span>
-            </div>
+            <div class="size-items-title">定尺</div>
             <div class="size-num-title">
-              支数 <span class="s-txt">{{ sizeArrs[0] ? Number(sizeArrs[0]) + 'm' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[0] ? '170 / ' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[0] ? Number(sizeArrs[0]) : '' }}</span>
             </div>
           </a-descriptions-item>
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
-            <div class="size-items-title">
-              定尺&nbsp;&nbsp;&nbsp;&nbsp;
-              <span class="s-txt">{{ sizeArrs[1] ? '170' : '' }}</span>
-            </div>
+            <div class="size-items-title"> 定尺 </div>
             <div class="size-num-title">
-              支数 <span class="s-txt">{{ sizeArrs[1] ? Number(sizeArrs[1]) + 'm' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[1] ? '170 / ' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[1] ? Number(sizeArrs[1]) : '' }}</span>
             </div>
           </a-descriptions-item>
           <!-- <a-descriptions-item label="序号" :labelStyle="labelStyle" :contentStyle="contentStyle">
             炉号
             <div class="two-num-wrapper">
               <span class="s-txt">{{ sizeArrs[2] ? '170' : '' }}</span>
-              <span class="s-txt">{{ sizeArrs[2] ? Number(sizeArrs[2]) / 1000 + 'm' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[2] ? Number(sizeArrs[2]) / 1000 : '' }}</span>
             </div>
           </a-descriptions-item> -->
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
-            <div class="size-items-title">
-              定尺&nbsp;&nbsp;&nbsp;&nbsp;
-              <span class="s-txt">{{ sizeArrs[2] ? '170' : '' }}</span>
-            </div>
+            <div class="size-items-title"> 定尺 </div>
             <div class="size-num-title">
-              支数 <span class="s-txt">{{ sizeArrs[2] ? Number(sizeArrs[2]) + 'm' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[2] ? '170 / ' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[2] ? Number(sizeArrs[2]) : '' }}</span>
             </div>
           </a-descriptions-item>
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
-            <div class="size-items-title">
-              定尺&nbsp;&nbsp;&nbsp;&nbsp;
-              <span class="s-txt">{{ sizeArrs[3] ? '170' : '' }}</span>
-            </div>
+            <div class="size-items-title"> 定尺 </div>
             <div class="size-num-title">
-              支数 <span class="s-txt">{{ sizeArrs[3] ? Number(sizeArrs[3]) + 'm' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[3] ? '170 / ' : '' }}</span>
+              <span class="s-txt">{{ sizeArrs[3] ? Number(sizeArrs[3]) : '' }}</span>
             </div>
           </a-descriptions-item>
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
-            <div class="size-items-title">
-              定尺&nbsp;&nbsp;&nbsp;&nbsp;
-              <span class="s-txt">
-                {{ sizeArrs[4] ? '170' : '' }}
-              </span>
-            </div>
+            <div class="size-items-title"> 定尺 </div>
             <div class="size-num-title">
-              支数 <span class="s-txt">{{ sizeArrs[4] ? Number(sizeArrs[4]) + 'm' : '' }}</span>
+              <span class="s-txt"> {{ sizeArrs[4] ? '170 / ' : '' }} </span>
+              <span class="s-txt">{{ sizeArrs[4] ? Number(sizeArrs[4]) : '' }}</span>
             </div>
           </a-descriptions-item>
           <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
-            <div class="size-items-title">
-              定尺&nbsp;&nbsp;&nbsp;&nbsp;
-              <span class="s-txt">
-                {{ sizeArrs[5] ? '170' : '' }}
-              </span>
-            </div>
+            <div class="size-items-title"> 定尺 </div>
             <div class="size-num-title">
-              支数 <span class="s-txt">{{ sizeArrs[5] ? Number(sizeArrs[5]) + 'm' : '' }}</span>
+              <span class="s-txt"> {{ sizeArrs[5] ? '170 / ' : '' }} </span>
+              <span class="s-txt">{{ sizeArrs[5] ? Number(sizeArrs[5]) : '' }}</span>
             </div>
           </a-descriptions-item>
           <!-- <a-descriptions-item :labelStyle="sizeLabelStyle" :contentStyle="sizeContentStyle">
@@ -350,12 +334,14 @@
       border-bottom: 1px solid #bfbfbf;
       padding-left: 10px;
       min-width: 77px;
+      text-align: center;
     }
 
     .size-num-title {
+      height: 32px;
       font-size: 12px;
       line-height: 32px;
-      padding-left: 4px;
+      text-align: center;
     }
 
     .size-items-content {

+ 7 - 4
src/views/billet/operator/components/printOriginalRecords.vue

@@ -69,7 +69,8 @@
             <a-table-summary-row class="summary-row-no-border">
               <a-table-summary-cell :row-span="2" :col-span="remakeColSpan">
                 <div class="summary-cell-remark">
-                  <a-textarea v-model:value="mainRemark" @blur="handleRemarkBlur" style="min-height: 160px" :bordered="false" />
+                  <a-textarea v-model:value="mainRemark" @blur="handleRemarkBlur" style="min-height: 160px; padding-top: 0;" :bordered="false" />
+                  <div style="text-align: left; padding: 0 11px">{{ totalWeight }}</div>
                 </div>
               </a-table-summary-cell>
               <a-table-summary-cell :row-span="1" :col-span="1"> 热送 </a-table-summary-cell>
@@ -763,6 +764,7 @@
   const mainSize = ref('');
   const mainOrgRemark = ref('');
   const mainRemark = ref('');
+  const totalWeight = ref('');
   const isShowSwitchBtn = ref(false);
   const getHeatList = async (params, isSwitch = false) => {
     try {
@@ -1361,8 +1363,9 @@
         let allWeight = 0;
         // 热送统计
         if (Object.values(rollOneSize).length) {
-          hotSendList.value['一'] = Object.values(rollOneSize);
-          hotSendList.value['一'].forEach((ele) => (allWeight += ele.weight));
+          const sendKey = hostNumber.value == '5' ? '一' : '高';
+          hotSendList.value[sendKey] = Object.values(rollOneSize);
+          hotSendList.value[sendKey].forEach((ele) => (allWeight += ele.weight));
         }
         if (Object.values(rollTwoSize).length) {
           hotSendList.value['二'] = Object.values(rollTwoSize);
@@ -1395,7 +1398,7 @@
           coldSendList.value['上'].forEach((ele) => (allWeight += ele.weight));
         }
 
-        mainRemark.value = `合计:${allWeight.toFixed(3)} t`;
+        totalWeight.value = `合计:${allWeight.toFixed(3)} t`;
         // 查看所有的定尺
         mainSize.value = sizeInfo || [...new Set(allSizeArr)].join(',');
       }

+ 13 - 10
src/views/billet/operator/index.vue

@@ -125,6 +125,7 @@
   import printBilletSampleCard from './components/printBilletSampleCard.vue';
   import printOriginalRecords from './components/printOriginalRecords.vue';
   import JSearchSelect from '/@/components/Form/src/jeecg/components/JSearchSelect.vue';
+  import { isArray } from '/@/utils/is';
 
   const { createConfirm, createMessage } = useMessage();
 
@@ -202,16 +203,18 @@
 
     let oneTotal = 0;
     let oneWeight = 0;
-    let oneDtlList = hotSendList.map((item) => {
-      allNums += item.amount;
-      allWeight += item.weight;
-      oneTotal += item.amount;
-      oneWeight += item.weight;
-      return {
-        ...item,
-        nums: item.amount,
-      };
-    });
+    let oneDtlList =
+      isArray(hotSendList) &&
+      hotSendList.map((item) => {
+        allNums += item.amount;
+        allWeight += item.weight;
+        oneTotal += item.amount;
+        oneWeight += item.weight;
+        return {
+          ...item,
+          nums: item.amount,
+        };
+      });
     defaultDtlList[0].amount = oneTotal;
     defaultDtlList[0].weight = oneWeight;
     defaultDtlList[0].dtlList = oneDtlList;