Merge branch '0.8.X' of https://gitee.com/hdka/klp-oa into 0.8.X

klp-ui/src/components/KLPService/Renderer/ProductInfo.vue

@@ -8,7 +8,7 @@
     <el-dialog 
       :visible="showDetail" 
       @close="showDetail = false" 
-      title="产品信息" 
+      :title="product.productName" 
       width="500px"
       append-to-body
     >

klp-ui/src/components/KLPService/Renderer/RawMaterialInfo.vue

@@ -6,14 +6,13 @@
         {{ material.rawMaterialName ? material.rawMaterialName : '--' }}
       </slot>
     </span>
-    <el-dialog :visible="showDetail" @close="showDetail = false" :title="material.name" width="400px"
+    <el-dialog :visible="showDetail" @close="showDetail = false" :title="material.rawMaterialName" width="400px"
       append-to-body>
       <el-descriptions :column="1" border>
         <el-descriptions-item label="ID">{{ material.rawMaterialId }}</el-descriptions-item>
         <el-descriptions-item label="名称">{{ material.rawMaterialName }}</el-descriptions-item>
         <el-descriptions-item label="描述">{{ material.rawMaterialCode }}</el-descriptions-item>
       </el-descriptions>
-
       <BomInfo :bomId="material.bomId" />
     </el-dialog>
   </div>
@@ -21,8 +20,13 @@
 
 <script>
 import { mapState } from 'vuex';
+import BomInfo from './BomInfo.vue';
+
 export default {
   name: 'RawMaterialInfo',
+  components: {
+    BomInfo
+  },
   props: {
     materialId: {
       type: [String, Number],

klp-ui/src/views/index.vue

@@ -38,33 +38,6 @@
       </div>
     </div>
 
-    <!-- 监控面板 -->
-    <!-- <div class="monitor-panel">
-      <div class="monitor-resource">
-        <h3 class="monitor-title">系统资源监控</h3>
-        <div class="monitor-resource-charts">
-          <div v-for="(chart, index) in resourceCharts" :key="index" class="monitor-resource-chart">
-            <div ref="resourceChart" class="chart-inner"></div>
-          </div>
-        </div>
-      </div>
-      <div class="monitor-records">
-        <h3 class="monitor-title">最近操作记录</h3>
-        <div class="monitor-records-list">
-          <div v-for="(record, index) in operationRecords" :key="index" 
-               class="monitor-record-item">
-            <div :class="['monitor-record-icon', getModuleBg(record.bgColor)]">
-              <i :class="['monitor-record-icon-inner', record.icon]"></i>
-            </div>
-            <div>
-              <p class="monitor-record-action">{{ record.action }}</p>
-              <p class="monitor-record-time">{{ record.time }}</p>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div> -->
-
     <!-- 全部应用 -->
     <AllApplications />
   </div>

klp-ui/src/views/login.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login">
     <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form">
-      <h3 class="title">RuoYi-Flowable-Plus后台管理系统</h3>
+      <h3 class="title">科伦普WMS系统</h3>
       <el-form-item prop="username">
         <el-input
           v-model="loginForm.username"

klp-ui/src/views/wms/productBom/index.vue

@@ -65,8 +65,16 @@
 
     <el-table v-loading="loading" :data="productBomList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="产品" align="center" prop="productName" />
-      <el-table-column label="原材料" align="center" prop="rawMaterialName" />
+      <el-table-column label="产品" align="center" prop="productName">
+        <template slot-scope="scope">
+          <ProductInfo :productId="scope.row.productId" />
+        </template>
+      </el-table-column>
+      <el-table-column label="原材料" align="center" prop="rawMaterialName">
+        <template slot-scope="scope">
+          <RawMaterialInfo :materialId="scope.row.rawMaterialId" />
+        </template>
+      </el-table-column>
       <el-table-column label="原材料数量" align="center" prop="quantity" />
       <el-table-column label="单位" align="center" prop="unit" />
       <el-table-column label="备注" align="center" prop="remark" />
@@ -127,12 +135,16 @@
 import { listProductBom, getProductBom, delProductBom, addProductBom, updateProductBom } from "@/api/wms/productBom";
 import ProductSelect from "@/components/KLPService/ProductSelect";
 import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
+import ProductInfo from "@/components/KLPService/Renderer/ProductInfo";
+import RawMaterialInfo from "@/components/KLPService/Renderer/RawMaterialInfo";
 
 export default {
   name: "ProductBom",
   components: {
     ProductSelect,
-    RawMaterialSelect
+    RawMaterialSelect,
+    ProductInfo,
+    RawMaterialInfo
   },
   data() {
     return {