Merge branch 'bonus-jyy-smart-canteen' of http://192.168.0.75:3000/bonus/bonus-ui into bonus-jyy-smart-canteen

src/views/foodManage/purchaseManage/goodsInquiry/checkPrice.vue

@@ -91,18 +91,17 @@
                     <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" />
                     <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" />
                     <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true">
-                    </el-table-column>
-                    <el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true" />
-                    <el-table-column label="报价数量" align="center" prop="quoteNum" :show-overflow-tooltip="true" />
-                    <el-table-column label="中选单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
+                    <el-table-column label="货品规格" align="center" prop="size" :show-overflow-tooltip="true"> 
+                    </el-table-column> 
+                    <el-table-column label="单价" align="center" prop="singlePrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
                           <span>{{ (scope.row.singlePrice/100).toFixed(2) }}</span>
                         </template>
                     </el-table-column>
-                    <el-table-column label="中选总价（元）" align="center" prop="totalPrice" :show-overflow-tooltip="true">
+                    <el-table-column label="采购数量" align="center" prop="purNum" :show-overflow-tooltip="true" /> 
+                    <el-table-column label="小计" align="center" prop="totalPrice" :show-overflow-tooltip="true">
                         <template slot-scope="scope">
-                          <span>{{ (scope.row.totalPrice/100).toFixed(2) }}</span>
+                          <span>{{ ((scope.row.singlePrice/100)*scope.row.purNum).toFixed(2) }}</span>
                         </template>
                     </el-table-column>
                 </el-table>

src/views/foodManage/stockManage/warehouseOut/edit.vue

@@ -53,7 +53,7 @@
                 </div>
                 <div style="display: flex;align-items: center;">
                     <el-button type="primary" plain @click="addMaterial">添加货品</el-button>
-                    <!-- <el-button type="primary" plain @click="importMaterial">导入领料单</el-button> -->
+                    <el-button type="primary" plain @click="importMaterial">导入领料单</el-button>
                     <el-button type="danger" plain @click="delMaterial">删除</el-button>
                 </div>
             </div>
@@ -147,8 +147,8 @@
             </div>
         </el-dialog> 
 
-        <!-- 选择货品 -->
-        <el-dialog title="导入采购订单" :visible.sync="openImportDialog" width="70%" append-to-body >
+        <!-- 选择领料单 -->
+        <el-dialog title="导入领料单" :visible.sync="openImportDialog" width="70%" append-to-body >
             <div style="width: 100%;height:620px;">
                 <el-form :model="queryParams2" ref="queryForm2" size="small" :inline="true" label-width="90px"> 
                     <el-form-item label="领料单标题" prop="title">
@@ -159,8 +159,7 @@
                         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery2">重置</el-button>
                     </el-form-item>
                 </el-form>
-                <el-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="520" :row-key="(row)=>{return row.fetchMaterialId}" @selection-change="handleSelectionChange3">
-                    <el-table-column type="selection" width="50" align="center" :reserve-selection="true" />
+                <el-table v-loading="loading2" :data="tableListData2" ref="multipleTable2" height="220" highlight-current-row @current-change="handleCurrentChange"> 
                     <el-table-column label="序号" align="center" width="80" type="index">
                         <template slot-scope="scope">
                         <span>{{(queryParams2.pageNum - 1) * queryParams2.pageSize + scope.$index + 1}}</span>
@@ -184,9 +183,19 @@
                     :limit.sync="queryParams2.pageSize"
                     @pagination="getList2"
                 /> 
+                <div>
+                    <div>领料单明细</div>
+                    <el-table :data="materialDetailsData"  height="250"> 
+                        <el-table-column label="货品编码" align="center" prop="materialCode" :show-overflow-tooltip="true" /> 
+                        <el-table-column label="货品名称" align="center" prop="materialName" :show-overflow-tooltip="true" /> 
+                        <el-table-column label="货品类别" align="center" prop="materialTypeName" :show-overflow-tooltip="true" /> 
+                        <el-table-column label="计量单位" align="center" prop="unitName" :show-overflow-tooltip="true" /> 
+                        <el-table-column label="领料数量" align="center" prop="fetchNum" :show-overflow-tooltip="true" />  
+                    </el-table> 
+                </div>
             </div>
             <div slot="footer" class="dialog-footer">
-                <el-button type="primary" @click="">确 定</el-button>
+                <el-button type="primary" @click="confirmImport">确 定</el-button>
                 <el-button @click="openImportDialog=false">取 消</el-button>
             </div>
         </el-dialog> 
@@ -198,8 +207,8 @@ import { imgUpLoadTwo } from '@/api/system/upload'
 import { systemAreaTreeApi } from "@/api/base/stall"; 
 import { systemMaterialTreeApi,getStockMaterialListApi,drpWareHousePageApi } from "@/api/foodManage/stockManage";  
 import { getWarehouseOutInfoApi,addWarehouseOutApi,editWarehouseOutApi } from "@/api/foodManage/stockManage";
-//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi
-import { fetchMaterialPageApi } from "@/api/foodManage/pickManage";
+import { fetchMaterialPageApi,getFetchMaterialInfoApi } from "@/api/foodManage/pickManage"; 
+//warehouseOutPageApi getWarehouseOutInfoApi addWarehouseOutApi editWarehouseOutApi delWarehouseOutApi 
 export default {
     name: "WarehouseOutEdit",
     dicts: [],
@@ -267,6 +276,7 @@ export default {
         loading2:false,
         total2: 0, // 总条数
         tableListData2: [],//导入弹窗-表格数据
+        materialDetailsData:[]
       };
     },
     created() {
@@ -571,9 +581,34 @@ export default {
                 this.loading2 = false;
             });
         },
-        handleSelectionChange3(selection) {
-            
+        //选中
+        handleCurrentChange(row){
+            console.log(row)
+            this.importRow = row;
+            let param = {
+                fetchMaterialId:this.importRow.fetchMaterialId
+            }
+            getFetchMaterialInfoApi(param).then((response) => { 
+                this.materialDetailsData = response.rows||[];  
+            });
         },
+        confirmImport(){ 
+            if(this.materialDetailsData.length>0){
+                this.$modal.confirm('是否确认覆盖货品明细?').then(() => {
+                    this.materialList = this.materialDetailsData; 
+                    // this.materialList.forEach(item=>{
+                    //     this.$set(item,"orderNum",item.purchaseNum)
+                    // })
+                    // this.baseInfo.purchasePlanCode = this.importRow.planCode; 
+                    this.$set(this.baseInfo,"remark","导入领料单")
+                    setTimeout(()=>{ 
+                        this.openImportDialog=false
+                    },500) 
+                }).catch(() => {}); 
+            }else{
+                this.$modal.msgError("采购计划明细无货品");
+            }
+        }, 
         patternValue(row){ 
             row.fetchNum = row.fetchNum.replace(/[^\d.]/g, '').replace(/^(\d*\.\d{2}).*$/, '$1')
             setTimeout(()=>{