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

klp-ui/src/views/login.vue

@@ -142,6 +142,8 @@ export default {
           }
           this.$store.dispatch("Login", this.loginForm).then(() => {
             this.$store.dispatch('category/getCategoryList');
+            this.$store.dispatch('category/getProductMap');
+            this.$store.dispatch('category/getRawMaterialMap');
             this.$router.push({ path: this.redirect || "/" }).catch(()=>{});
           }).catch(() => {
             this.loading = false;

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

@@ -126,7 +126,7 @@
             icon="el-icon-s-operation"
             @click="showClac(scope.row)"
             v-if="scope.row.orderStatus === EOrderStatus.NEW"
-          >智能采购单</el-button>
+          >初次采购推荐</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -59,6 +59,7 @@
           <div style="font-size: 13px; color: #888;">产品ID: {{ item.productName }} ({{ item.productCode }})</div>
           <div style="font-size: 13px; color: #888;">备注: {{ item.remark }}</div>
           <div style="margin-top: 12px; text-align: right;">
+            <el-button size="mini" type="primary" icon="el-icon-edit" @click.stop="goToDetail(item.scriptId)">详情</el-button>
             <el-button size="mini" type="primary" icon="el-icon-edit" @click.stop="handleUpdate(item)">修改</el-button>
             <el-button size="mini" type="danger" icon="el-icon-delete" @click.stop="handleDelete(item)">删除</el-button>
           </div>

klp-ui/src/views/wms/purchasePlan/panels/clac.vue

@@ -15,6 +15,8 @@
 <script>
 import RecommendPurchasePanel from './RecommendPurchasePanel.vue'
 import CreatePurchasePanel from './CreatePurchasePanel.vue'
+import { updatePurchasePlan } from '@/api/wms/purchasePlan'
+import { EOrderStatus } from '@/api/wms/order'
 
 export default {
   name: 'PurchasePlanClac',
@@ -38,7 +40,13 @@ export default {
       this.recommendData = data
     },
     onConfirm(submitData) {
-      this.$emit('confirm', submitData)
+      updatePurchasePlan({
+        orderId: this.orderId,
+        orderStatus: EOrderStatus.PRODUCTIONING,
+      }).then(response => {
+        this.$emit('confirm', submitData)
+      })
+      
     }
   }
 }

klp-ui/src/views/wms/stockIo/panels/detail.vue

@@ -80,7 +80,13 @@
                 <dict-tag :options="dict.type.stock_item_type" :value="scope.row.itemType" />
               </template>
             </el-table-column>
-            <el-table-column label="物品ID" align="center" prop="itemId" />
+            <el-table-column label="物品信息" align="center" prop="itemId">
+              <template slot-scope="scope">
+                <raw-material-info v-if="scope.row.itemType === ITEM_TYPE.RAW_MATERIAL" :material-id="scope.row.itemId" />
+                <product-info v-else-if="scope.row.itemType === ITEM_TYPE.PRODUCT" :product-id="scope.row.itemId" />
+                <span v-else>{{ scope.row.itemId }}</span>
+              </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="batchNo" />
@@ -229,13 +235,16 @@ import WarehouseSelect from '@/components/WarehouseSelect';
 import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect';
 import ProductSelect from '@/components/KLPService/ProductSelect';
 import { ITEM_TYPE } from '@/utils/enums';
+import {RawMaterialInfo, ProductInfo} from "@/components/KLPService";
 
 export default {
   name: "StockIoDetailPanel",
   components: {
     WarehouseSelect,
     RawMaterialSelect,
-    ProductSelect
+    ProductSelect,
+    RawMaterialInfo,
+    ProductInfo
   },
   dicts: ['stock_item_type'],
   props: {