소스 검색

修复打单bug

ZZJ 1 년 전
부모
커밋
7e7e2efaf9

+ 2 - 2
src/views/system/jbdScan/goods/bwlingliaodan.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="bg">
     <el-dialog width="900px" height="279mm" :modal-append-to-body="false" title="领料单" :visible.sync="scanVisible">
-      <!-- 列表页面打印 -->
+      <!-- 标准物质领料单列表 - 列表页面打印 -->
       <div style="height: 500px; width: 86%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">
@@ -228,7 +228,7 @@ export default {
                 data["name1"] = name1;
               });
             }
-            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_0ttun9m' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_0y5ro3g' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s2).then((res) => {
               name2 = res.variables.data[0].NAME_;
               time2 = res.variables.data[0].CREATE_TIME_;

+ 2 - 1
src/views/system/jbdScan/goods/caigourukudan.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="bg">
+  <!-- 物料技术验收记录表 - 技术列表页面打印 -->
     <el-dialog
       width="900px"
       height="12cm"
@@ -7,7 +8,7 @@
       title="采购入库单"
       :visible.sync="scanVisible"
     >
-      <!-- 表单是否显示 技术列表页面打印-->
+      <!--表单是否显示 -->
       <div style="height: 500px; width: 86%; margin: 0 auto;overflow: hidden;" v-if="scanVisible">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">

+ 1 - 1
src/views/system/jbdScan/goods/chnangguirukudan.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="bg">
-    <!-- 常规列表页面打印入库单 -->
+  <!-- 物料验收记录表 - 列表页面打印入库单 -->
     <el-dialog
       width="900px"
       height="279mm"

+ 1 - 0
src/views/system/jbdScan/goods/lingliaodan.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="bg">
+    <!-- 物料领用出库记录列表 -->
     <el-dialog
       width="900px"
       height="279mm"

+ 2 - 1
src/views/system/jbdScan/wuliao/bwlingliaodan.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="bg">
+    <!-- 标准物质领料单列表 - 流程节点打印 -->
     <el-dialog
       width="900px"
       height="279mm"
@@ -247,7 +248,7 @@ export default {
                 data["name1"] = name1;
               });
             }
-            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_0ttun9m' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
+            let s2 = `select a.NAME_,DATE_FORMAT(b.CREATE_TIME_,'%Y-%m-%d') AS CREATE_TIME_ FROM ibps_party_employee  as a join ibps_bpm_oper_log as b on a.ID_ = b.CREATE_BY_ where b.PROC_INST_ID_ = ( SELECT  PROC_INST_ID_  FROM ibps_bpm_bus_rel WHERE BUSINESSKEY_ = '${item.id_}' LIMIT 1) AND b.NODE_ID_ = 'Activity_0y5ro3g' ORDER BY b.CREATE_TIME_ DESC LIMIT 1`;
             repostCurd("sql", s2).then((res) => {
               name2 = res.variables.data[0].NAME_;
               time2 = res.variables.data[0].CREATE_TIME_;

+ 1 - 1
src/views/system/jbdScan/wuliao/caigourukudan.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="bg">
+  <!-- 物料验收记录表 - 流程页面打印 -->
     <el-dialog
       width="900px"
       height="279mm"
       :modal="!alertVisible"
       :visible.sync="alertVisible"
     >
-      <!-- 表单是否显示 技术列表流程页面打印 -->
       <div style="height: 500px; width: 86%; margin: 0 auto" >
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">

+ 13 - 25
src/views/system/jbdScan/wuliao/chnangguirukudan.vue

@@ -1,5 +1,5 @@
 <template>
-  <!-- //流程常规验收入库单 -->
+  <!-- 物料验收记录表 - 流程常规验收入库单 -->
   <div class="bg">
     <el-dialog
       width="900px"
@@ -60,7 +60,7 @@
                         <td style="width: 60px">{{ item.pi_hao_ }}</td>
                         <td style="width: 80px">{{ item.gui_ge_xing_hao_ }}</td>
                         <td style="width: 100px"> {{ item.gong_ying_shang_| gongyingshang(gongyingshangList) }} </td>
-                        <td style="width: 45px">{{ item.shu_liang_ }}</td>
+                        <td style="width: 45px">{{ (Math.abs(item.shu_liang_) * 1) }}</td>
                         <td style="width: 45px">{{ item.dan_wei_ }}</td>
                         <td style="width: 60px;padding: 1px;">{{ item.dan_jia_han_shui_ |numToFixed}}</td>
                         <td style="width: 45px">{{ item.shui_lv_ }}</td>
@@ -73,7 +73,7 @@
                         <td colspan="15">
                           合计&nbsp;&nbsp;&nbsp;&nbsp;
                           税额:&nbsp;{{ item1|addshuieToFixed}}&nbsp;&nbsp;
-                          金额:&nbsp;{{ item1|addshuieToFixed}}&nbsp;&nbsp;
+                          金额:&nbsp;{{ item1|addjineToFixed}}&nbsp;&nbsp;
                           含税合计:&nbsp;{{ item1|addhshjToFixed }}
                         </td>
                       </tr>
@@ -167,41 +167,29 @@ export default {
       }
     },
     numToFixed: function (value) {
-      return (value*1).toFixed(2)
+      return (Math.abs(value * 1)).toFixed(2)
     },
     jineToFixed:function(a,b){
-     let value = (a * 1) * (b * 1);
-     
+     let value = (Math.abs((a * 1) * (b * 1)) * 1);
      return value.toFixed(2)
     },
     shuieToFixed:function(a,b,c){
-      let jine = b*1*(c*1);
-      let hshj = b*1*(a*1);
+      let jine = (Math.abs(b*1*(c*1)) * 1);
+      let hshj = (Math.abs(b*1*(a*1)) * 1);
       let value = hshj - jine;
       return value.toFixed(2);
     },
     addshuieToFixed:function(arr){
-      let adds =0;
-      arr.forEach(item=>{
-        adds =adds+(((item.shu_liang_*1) * (item.dan_jia_han_shui_*1)) - ((item.shu_liang_*1) * (item.dan_jia_*1)) );
-      })
-      return adds.toFixed(2);
+      const total = arr.reduce((account,item) => account + (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_han_shui_) * 1) - (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_) * 1),0)
+      return total.toFixed(2)
     },
     addjineToFixed(arr){
-      let adds =0;
-      arr.forEach(item=>{
-        
-        adds =adds+((item.shu_liang_*1) * (item.dan_jia_*1));
-      })
-      return adds.toFixed(2);
+      const total = arr.reduce((account,item) => account + (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_) * 1),0)
+      return total.toFixed(2)
     },
     addhshjToFixed(arr){
-      let adds =0;
-      arr.forEach(item=>{
-        
-        adds =adds+((item.shu_liang_*1) * (item.dan_jia_han_shui_*1));
-      })
-      return adds.toFixed(2);
+      const total = arr.reduce((account,item) => account + (Math.abs(item.shu_liang_) * 1) * (Math.abs(item.dan_jia_han_shui_) * 1),0)
+      return total.toFixed(2)
     },
     bumenfilters: function (value, list) {
       // 

+ 1 - 1
src/views/system/jbdScan/wuliao/lingliaodan.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="bg">
+    <!-- 物料领用出库 - 流程节点页面打印-->
     <el-dialog
       width="900px"
       height="279mm"
       :modal="!alertVisible"
       :visible.sync="alertVisible "
     >
-      <!-- 流程节点页面打印-->
       <div style="height: 500px; width: 86%; margin: 0 auto">
         <div ref="qrcode" id="box">
           <vue-easy-print tableShow ref="easyPrint" :onePageRow="onePageRow">