修改借料管理页面

src/api/wisdom/borrow.js

@@ -1,20 +1,4 @@
 import request from '@/utils/request'
-//借料记录列表
-export function listOutbound(data) {
-  return request({
-	url: '/wisdom/stock/borrow/list',
-	method: 'post',
-	data: data
-  })
-}
-// 借料出库保存
-export function addOutbound(data) {
-  return request({
-	url: '/wisdom/stock/outStock',
-	method: 'put',
-	data: data
-  })
-}
 // 还料入库保存
 export function returnSubmit(data) {
 	return request({
@@ -22,4 +6,12 @@ export function returnSubmit(data) {
 	  method: 'post',
 	  data: data
 	})
+  }
+  // 新增借调查询项目号列表
+  export function listStockByXm(data) {
+	return request({
+	  url: '/wisdom/stock/list',
+	  method: 'get',
+	  params: data
+	})
   }

src/views/plan/jh/index.vue

@@ -177,6 +177,8 @@
       <el-table-column label="订单编号" align="center" prop="sapNo" width="100"/>
       <el-table-column label="行号" align="center" prop="xh" />
       <el-table-column label="计划交货数量" align="center" prop="jhQty" width="120"/>
+      <el-table-column label="实际入库数量" align="center" prop="realQty" width="120"/>
+      <el-table-column label="待入库数量" align="center" prop="waitQty" width="120"/>
       <el-table-column label="合同数量" align="center" prop="htQty" />
       <el-table-column label="计量单位" align="center" prop="dw" />
       <el-table-column label="身份码" align="center" prop="entityId" width="150"/>

src/views/wisdom/bill/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <el-splitter>
-      <el-splitter-panel size="40%">
+      <el-splitter-panel size="40%" style="margin-right:24px">
         <el-form :model="queryParams" ref="queryRef" v-show="showSearch" label-width="90">
           <el-row>
             <el-col :span="12">
@@ -11,7 +11,7 @@
                   @keyup.enter="handleQuery" />
               </el-form-item>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="单据号" prop="billNo">
                 <el-input v-model="queryParams.billNo" placeholder="请输入单据号" clearable @keyup.enter="handleQuery" />
               </el-form-item>
@@ -27,7 +27,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="10">
+            <el-col :span="12">
               <el-form-item label="库存状态" prop="execStatus">
                 <el-select v-model="queryParams.execStatus" placeholder="请选择库存状态" clearable @keyup.enter="handleQuery">
                   <el-option v-for="dict in execStatusMenu" :key="dict.value" :label="dict.label" :value="dict.value" />
@@ -37,17 +37,13 @@
           </el-row>
         </el-form>
         <el-row class="mb8">
-          <el-col :span="4">
+          <el-col :span="14">
             <el-button type="primary" plain @click="handleAdd(false)" v-hasPermi="['wisdom:bill:add']">新增入库</el-button>
-          </el-col>
-          <el-col :span="4">
             <el-button type="warning" plain @click="handleExport" v-hasPermi="['wisdom:bill:export']">导出</el-button>
-          </el-col>
-          <el-col :span="4">
             <el-button type="primary" plain @click="rkUpload">图片上传</el-button>
           </el-col>
 
-          <el-col :span="8">
+          <el-col :span="9" class="searchBtn">
             <el-form-item>
               <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
               <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -1542,17 +1538,12 @@ function autoFillFun() {
 }
 // 上传成功回调
 function handleAvatarSuccess(res, id, pcode) {
-  // console.log(222222)
-  // console.log(id)
-  // console.log(pcode)
   for (let i = 0; i < planList.value.length; i++) {
     if (planList.value[i].id == id && planList.value[i].pcode == pcode) {
       planList.value[i].photoUrl = res.url;
     }
   }
-  // console.log(222222)
+
-  // console.log(res)
-  // console.log(row)
 }
 //删除图片
 function handleRemove(res, id, pcode) {
@@ -1561,11 +1552,6 @@ function handleRemove(res, id, pcode) {
       planList.value[i].photoUrl = "";
     }
   }
-  // console.log(33333333)
-  // console.log(planList.value)
-  // console.log(res)
-  // console.log(id)
-  // console.log(pcode)
 }
 function delPic(picId) {
   proxy.$modal
@@ -1787,4 +1773,9 @@ isAudit();
   z-index: 1;
   top: -15px;
 }
+
+.searchBtn {
+  display: flex;
+  justify-content: flex-end;
+}
 </style>

src/views/wisdom/record/index.vue

@@ -101,7 +101,8 @@
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="stockList" show-overflow-tooltip border :row-class-name="tableBillRowClassName">
+    <el-table v-loading="loading" :data="stockList" show-overflow-tooltip border
+      :row-class-name="tableBillRowClassName">
       <el-table-column label="序号" align="center" type="index" width="70" />
       <el-table-column label="操作类型" align="center" prop="bizType" width="100">
         <template #default="scope">
@@ -161,11 +162,12 @@ const storeStatusList = ref([
   { id: '0', statusName: "已入库" },
   { id: '1', statusName: "已出库" }
 ])//库存状态
-
+// 0入库，1出库，2借料出库，3还料入库
 const isChukuList = ref([
   { value: '0', label: '入库', elTagType: "success", elTagClass: null },
-  { value: '1', label: '借料出库', elTagType: "warning", elTagClass: null },
+  { value: '1', label: '出库', elTagType: "warning", elTagClass: null },
-  { value: '3', label: '还料入库', elTagType: "warning", elTagClass: null },
+  { value: '2', label: '借料出库', elTagType: "", elTagClass: null },
+  { value: '3', label: '还料入库', elTagType: "danger", elTagClass: null },
 ])
 
 const data = reactive({
@@ -311,7 +313,7 @@ rklxList()
 // 显示预出库的状态
 const tableBillRowClassName = ({ row, rowIndex }) => {
   console.log('row===>',row);
-  
+
   if (row.execStatus == 0) {
     return 'success-row'
   }
@@ -332,7 +334,7 @@ const dictTagData = () => {
 }
 .el-table {
   /* 核心：把 hover 背景色设为和默认行背景色一致 */
-  --el-table-row-hover-bg-color: transparent; 
+  --el-table-row-hover-bg-color: transparent;
   /* 或设为和表格背景色相同（比如白色），更通用 */
   /* --el-table-row-hover-bg-color: #ffffff; */
 }