From c4cbb29fd3dd2f43da4f9af9967936edb86d1dcc Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期二, 30 五月 2023 08:07:45 +0800
Subject: [PATCH] 1.生产入库实现30%

---
 src/views/reportManager/logisticsCheck.vue |  118 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 63 insertions(+), 55 deletions(-)

diff --git a/src/views/reportManager/logisticsCheck.vue b/src/views/reportManager/logisticsCheck.vue
index 52f5174..d733d02 100644
--- a/src/views/reportManager/logisticsCheck.vue
+++ b/src/views/reportManager/logisticsCheck.vue
@@ -341,66 +341,74 @@
           min-width="100"
         >
           <template slot-scope="{row}">
-
-            <!--        ~褰撲笁涓�奸兘鏈�    -->
-            <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
-              <!--            <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">-->
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
+            <div style="display: flex;align-items: center">
+              <i
+                :class="row.check_result==='OK'?'el-icon-success':'el-icon-error'"
+                :style="{color:row.check_result==='OK'?$store.state.settings.theme:'red'}"
+                style="margin-right: 2px"
+              />
+              {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
             </div>
 
-            <!--            ~褰撳彧鏈夋爣鍑嗗�煎拰涓婇檺鍊兼椂  -->
-            <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
-            </div>
-            <!--            ~褰撳彧鏈夋爣鍑嗗�煎拰涓嬮檺鍊兼椂-->
-            <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
-            </div>
+            <!--            &lt;!&ndash;        ~褰撲笁涓�奸兘鏈�    &ndash;&gt;-->
+            <!--            <div v-if="row.standvalue&&row.uppervalue&&row.lowervalue&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+            <!--              &lt;!&ndash;            <div v-if="row[(index + 1) + '/' + dialogTableNumberCol]>=row.lowervalue&&row[(index + 1) + '/' + dialogTableNumberCol]<=row.uppervalue">&ndash;&gt;-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
 
-            <!--            ~褰撳彧鏈変笂闄愬�煎拰涓嬮檺鍊兼椂-->
-            <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
-            </div>
-            <!--            ~褰撳彧鏈夋爣鍑嗗�兼椂     -->
-            <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
-            </div>
-            <!--            ~褰撳彧鏈変笂闄愬�兼椂       -->
-            <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
-            </div>
+            <!--            &lt;!&ndash;            ~褰撳彧鏈夋爣鍑嗗�煎拰涓婇檺鍊兼椂  &ndash;&gt;-->
+            <!--            <div v-else-if="row.standvalue&&row.uppervalue&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
+            <!--            &lt;!&ndash;            ~褰撳彧鏈夋爣鍑嗗�煎拰涓嬮檺鍊兼椂&ndash;&gt;-->
+            <!--            <div v-else-if="row.standvalue&&row.lowervalue&&row.uppervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
 
-            <!--            ~褰撳彧鏈変笅闄愬�兼椂      -->
-            <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div></div>
+            <!--            &lt;!&ndash;            ~褰撳彧鏈変笂闄愬�煎拰涓嬮檺鍊兼椂&ndash;&gt;-->
+            <!--            <div v-else-if="row.uppervalue&&row.lowervalue&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
+            <!--            &lt;!&ndash;            ~褰撳彧鏈夋爣鍑嗗�兼椂     &ndash;&gt;-->
+            <!--            <div v-else-if="row.standvalue&&row.uppervalue===''&&row.lowervalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])===parseFloat(row.standvalue)">-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
+            <!--            &lt;!&ndash;            ~褰撳彧鏈変笂闄愬�兼椂       &ndash;&gt;-->
+            <!--            <div v-else-if="row.uppervalue&&row.lowervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])<=parseFloat(row.uppervalue)">-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
 
-            <div v-else>
-              <div style="display: flex;align-items: center">
-                <i class="el-icon-error" style="color: red;margin-right: 2px" />
-                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}
-              </div>
-            </div>
+            <!--            &lt;!&ndash;            ~褰撳彧鏈変笅闄愬�兼椂      &ndash;&gt;-->
+            <!--            <div v-else-if="row.lowervalue&& row.uppervalue===''&&row.standvalue===''&&parseFloat(row[(index + 1) + '/' + dialogTableNumberCol])>=parseFloat(row.lowervalue)">-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div></div>-->
+
+            <!--            <div v-else>-->
+            <!--              <div style="display: flex;align-items: center">-->
+            <!--                <i class="el-icon-error" style="color: red;margin-right: 2px" />-->
+            <!--                {{ row[(index + 1) + '/' + dialogTableNumberCol] }}-->
+            <!--              </div>-->
+            <!--            </div>-->
 
           </template>
         </el-table-column>

--
Gitblit v1.9.3