Merge branch 'master' of http://106.15.38.8:3000/yaoyq/imcs-yj-fe into master

imcs-ui/src/api/lineSideLibrary/lineSideMgr.js

@@ -58,6 +58,11 @@ const apiList = {
     method: 'POST',
     url: `/authority/stockInfo/preview`
   },
+  // 根据库位查询物品信息 
+  getGoodsListBystorgeId: {
+    method: 'POST',
+    url: `/authority/stockInfo/getGoodsListBystorgeId`
+  },
   export: {
     method: 'POST',
     url: `/authority/stockInfo/export`
@@ -164,6 +169,15 @@ export default {
       data
     })
   },
+  
+  // 根据库位查询物品信息
+  getGoodsListBystorgeId (data) {
+    return axiosApi({
+      ...apiList.getGoodsListBystorgeId,
+      data
+    })
+  },
+  
   export (data) {
     return axiosApi({
       ...apiList.export,

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideEmulate/Index.vue

@@ -63,7 +63,7 @@
 	  			<table class="contentDiv" border="0" cellspacing="0" cellpadding="6">
 	  				<tr v-for="objTr in item.layList">
 
-	  					<td v-for="objTd in objTr.stockList" :class="objTd.storgeStockCount>0 ? 'blueBg' : ''" @click="editOne(objTd.id)">
+	  					<td v-for="objTd in objTr.stockList" :class="objTd.storgeStockCount>0 ? 'blueBg' : ''" @click="editOne(objTd)">
 	  						{{objTd.no}}
 	  						<el-image v-if="objTd.lockStatus == '0'" class="locked" :src="resolveLogo(lockImg)" fit="contain"></el-image>
 	  					</td>
@@ -387,11 +387,11 @@
 	      this.tenantViewVisible = true
 	    },
 	    // 【修改】表头上Btn-事件
-	    editOne() {
-	    	this.edit(this.selection[0]);
+	    editOne(row) {
+	    	this.edit(row);
 	    },
 	    edit (row) {
-	      this.$refs.edit.setTenant(true, this.dicts)
+	      this.$refs.edit.setTenant(row, this.dicts)
 	      this.$refs.edit.type = "edit"
 	      this.dialog.title = this.$t("lineSide.common.libProd")
 	      this.dialog.isVisible = true

imcs-ui/src/views/zuihou/lineSideLibrary/lineSideEmulate/components/Edit.vue

@@ -14,7 +14,7 @@
 	      :key="tableKey"
 	      ref="table"
 	      v-loading="loading"
-	      :data="tableData.records"
+	      :data="tableData"
 	      border
 	      fit
 	      row-key="id"
@@ -22,6 +22,7 @@
 	      @selection-change="onSelectChange"
 	      @cell-click="cellClick"
 	    >
+	    	<!-- 序号 -->
 	    	<el-table-column :label='$t("common.serialNo")' width="55px" align="center">
 		      <template slot-scope="scope">
 		        <div>
@@ -29,17 +30,21 @@
 		        </div>
 		      </template>
 	      </el-table-column>
-	      <el-table-column align="center" type="selection" width="50" :reserve-selection="true" />
-	      <el-table-column prop="name" :label='$t("lineSide.table.emulateProd.name")' :show-overflow-tooltip="true"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name2")' width="180px"></el-table-column>
-	      <el-table-column prop="createTime" :label='$t("lineSide.table.emulateProd.name3")' width="180px"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name4")' width="180px"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name5")' width="180px"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name6")' width="180px"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name7")' width="180px"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name8")' width="180px"></el-table-column>
-	      <el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name9")' width="180px"></el-table-column>
-	      <el-table-column prop="status" :label='$t("lineSide.table.emulateProd.name10")' align="center" width="90px">
+	      <!--<el-table-column align="center" type="selection" width="50" :reserve-selection="true" />-->
+	      <!-- 产品类型 -->
+	      <el-table-column prop="categoryDesc" label='产品类型' :show-overflow-tooltip="true"></el-table-column>
+	      <!-- 入库产品名称 -->
+	      <el-table-column prop="brandName" label='入库产品名称' width="180px"></el-table-column>
+	      <!-- 产品唯一码 -->
+	      <el-table-column prop="uniqueCode" label='产品唯一码' width="180px"></el-table-column>
+	      <!-- 库存编码 -->
+	      <el-table-column prop="storgeId" label='库存编码' width="180px"></el-table-column>
+	      <!-- 数量 -->
+	      <el-table-column prop="stockNum" :label='$t("lineSide.table.emulateProd.name6")' width="180px"></el-table-column>
+	      <!-- 入库时间 -->
+	     	<el-table-column prop="updateTime" :label='$t("lineSide.table.emulateProd.name9")' width="180px"></el-table-column>
+	      <!-- 是否锁定 -->
+	      <el-table-column prop="lockStatus" :label='$t("lineSide.table.emulateProd.name10")' align="center" width="90px">
 	      	<template slot-scope="{ row }">
 	          <el-tag :type="row.status=='1' ? 'success' : 'danger'">
 	          	{{ row.status=='1' ? $t("common.yes") : $t("common.no") }}
@@ -47,13 +52,13 @@
 	        </template>
 	      </el-table-column>
 	    </el-table>
-	    <pagination
+	    <!--<pagination
 	      v-show="tableData.total > 0"
 	      :limit.sync="queryParams.size"
 	      :page.sync="queryParams.current"
 	      :total="Number(tableData.total)"
 	      @pagination="fetch"
-	    />
+	    />-->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button plain type="warning" @click="isVisible = false">{{ $t('common.cancel') }}</el-button>
@@ -63,13 +68,17 @@
 <script>
 	
 import { initQueryParams } from '@/utils/commons'
-import Pagination from "@/components/Pagination"
+// import Pagination from "@/components/Pagination"
 // 【仓库类型管理】-API
 import warehouseTypeMgrApi from "@/api/modelingCenter/warehouseTypeMgr"
+// 【边线库管理】-API
+import lineSideMgrApi from "@/api/lineSideLibrary/lineSideMgr"
 
 export default {
   name: 'TenantEdit',
-  components: { Pagination },
+  components: { 
+  //	Pagination 
+  },
   props: {
     dialogVisible: {
       type: Boolean,
@@ -113,7 +122,7 @@ export default {
   // 实例已经在内存中创建好，此时data和methods已将ok,如果要操作data中的数据或是调用methods中的方法，最早只能在created中操作
   created() {
   	// 加载列表数据
-  	this.fetch()
+  	// this.fetch()
 	},
   computed: {
     isVisible: {
@@ -153,7 +162,10 @@ export default {
     },
     setTenant (val, dicts) {
     	if(val){
+    		console.log("库位产品：", val);
     		this.tenant = { ...val }
+    		// 加载列表数据
+  			this.getList(val);
     	}
       // 字典表
       this.dicts = dicts
@@ -224,6 +236,21 @@ export default {
           return true
         })
     },
+    
+    // 获取列表数据
+    getList (row) {
+	      this.loading = true
+	      lineSideMgrApi.getGoodsListBystorgeId({ storgeId: row.id }).then(response => {
+	        const res = response.data
+	        console.log("res123123214==== ", res);
+	        if (res.isSuccess) {
+	          this.tableData = res.data
+	        }
+	        // eslint-disable-next-line no-return-assign
+	      }).finally(() => this.loading = false)
+	     
+	    },
+	    
     fetch (params = {}) {
 	      this.loading = true
 	      if (this.queryParams.timeRange) {
@@ -233,7 +260,7 @@ export default {
 	
 	      this.queryParams.current = params.current ? params.current : this.queryParams.current
 	      this.queryParams.size = params.size ? params.size : this.queryParams.size
-	      warehouseTypeMgrApi.page(this.queryParams).then(response => {
+	      lineSideMgrApi.page(this.queryParams).then(response => {
 	        const res = response.data
 	        if (res.isSuccess) {
 	          this.tableData = res.data