修改出、入库页面以及移库页面

src/views/wisdom/bill/index.vue

@@ -140,6 +140,7 @@
               <span>{{ getExecStatusName(scope.row.execStatus) }}</span>
             </template>
           </el-table-column>
+          <el-table-column label="订单编号" align="center" prop="sapNo" width="150" />
           <el-table-column label="项目号" align="center" prop="xmNo" width="150" />
           <el-table-column label="项目描述" align="center" prop="xmMs" width="250" />
           <el-table-column label="物料号" align="center" prop="wlNo" width="100" />
@@ -147,17 +148,16 @@
           <el-table-column label="供应商名称" align="center" prop="gysMc" width="200" />
           <el-table-column label="合同单价" align="center" prop="htDj" />
           <el-table-column label="总计" align="center" prop="totalAmount" />
-          <el-table-column label="订单编号" align="center" prop="sapNo" width="150" />
           <el-table-column label="计量单位" align="center" prop="dw" />
           <el-table-column label="实际入库数量" align="center" prop="realQty" width="120" />
+          <el-table-column label="库位码" align="center" prop="pcode" width="120" />
+          <el-table-column label="备注" align="center" prop="remark" width="200" />
           <el-table-column label="是否移库" align="center" prop="isMove">
             <template #default="scope">
               <span>{{ isMoveFun(scope.row.hasMoved) }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="库位码" align="center" prop="pcode" width="120" />
           <el-table-column label="托盘码" align="center" prop="trayCode" />
-          <el-table-column label="身份码" align="center" prop="entityId" width="200" />
           <el-table-column label="所属大仓" align="center" prop="parentWarehouseName" width="150" />
           <el-table-column label="所属小仓" align="center" prop="warehouseName" width="150" />
           <!-- <el-table-column label="库龄" align="center" prop="stockAge" /> -->
@@ -168,9 +168,10 @@
                 @click="preview(scope.row.scenePhotoUrl)" />
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" prop="remark" width="200" />
+
           <el-table-column label="一次封样号" align="center" prop="fycde1" width="150" />
           <el-table-column label="二次封样号" align="center" prop="fycde2" width="150" />
+          <el-table-column label="身份码" align="center" prop="entityId" width="200" />
           <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
             <template #default="scope">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -376,13 +377,6 @@
               <el-input v-if="scope.row.isnew" v-model="scope.row.dw"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="库位" align="center" width="150">
-            <template #default="scope">
-              <el-select v-model="scope.row.pcode" clearable @change="changePcode" filterable placeholder="请选择库位">
-                <el-option v-for="item in kwOptions" :key="item.pcode" :label="item.pcode" :value="item.pcode" />
-              </el-select>
-            </template>
-          </el-table-column>
           <el-table-column label="入库数量" align="center" width="150">
             <template #default="scope">
               <el-input v-model="scope.row.realQty" placeholder="入库数量">
@@ -392,9 +386,18 @@
               </el-input>
             </template>
           </el-table-column>
-          <el-table-column label="身份码" align="center" width="200">
+          <el-table-column label="库位" align="center" width="150">
             <template #default="scope">
-              <el-input v-model="scope.row.entityId" placeholder="请输入身份码"></el-input>
+              <el-select v-model="scope.row.pcode" clearable @change="changePcode" filterable placeholder="请选择库位">
+                <el-option v-for="item in kwOptions" :key="item.pcode" :label="item.pcode" :value="item.pcode" />
+              </el-select>
+            </template>
+          </el-table-column>
+
+
+          <el-table-column label="备注" align="center" width="200">
+            <template #default="scope">
+              <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="采购订单号" align="center" prop="sapNo" width="130">
@@ -422,9 +425,9 @@
               <el-input v-model="scope.row.trayCode" placeholder="请输入容器码"></el-input>
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" width="200">
+          <el-table-column label="身份码" align="center" width="200">
             <template #default="scope">
-              <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
+              <el-input v-model="scope.row.entityId" placeholder="请输入身份码"></el-input>
             </template>
           </el-table-column>
           <el-table-column label="一次封样号" align="center" width="200">

src/views/wisdom/move/index.vue

@@ -2,31 +2,44 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" label-width="68px">
       <el-row :gutter="40">
+        <el-col :span="6">
+          <el-form-item label="订单编号" prop="sapNo">
+            <el-input v-model="queryParams.sapNo" placeholder="请输入订单编号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="物料号" prop="wlNo">
+            <el-input v-model="queryParams.wlNo" placeholder="请输入物料号" clearable @keyup.enter="handleQuery" />
+          </el-form-item>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="原仓库" prop="fromCangku">
-            <el-select v-model="queryParams.fromCangku" placeholder="请选择仓库" clearable >
+            <el-select v-model="queryParams.fromCangku" placeholder="请选择仓库" clearable>
-                <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.warehouseName" :value="dict.warehouseCode" />
+              <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.warehouseName"
+                :value="dict.warehouseCode" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="目标仓库" prop="toCangku">
-            <el-select v-model="queryParams.toCangku" placeholder="请选择仓库" clearable >
+            <el-select v-model="queryParams.toCangku" placeholder="请选择仓库" clearable>
-                <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.warehouseName" :value="dict.warehouseCode" />
+              <el-option v-for="dict in warehouseList" :key="dict.id" :label="dict.warehouseName"
+                :value="dict.warehouseCode" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="6">
           <el-form-item label="项目号" prop="xmNo">
-            <el-input
+            <el-input v-model="queryParams.xmNo" placeholder="请输入项目号" clearable @keyup.enter="handleQuery" />
-              v-model="queryParams.xmNo"
-              placeholder="请输入项目号"
-              clearable
-              @keyup.enter="handleQuery"
-            />
           </el-form-item>
         </el-col>
         <el-col :span="6">
+          <el-form-item label="移库时间" prop="optionTime">
+            <el-date-picker v-model="optionTime" type="datetimerange" start-placeholder="开始时间" end-placeholder="结束时间"
+              format="YYYY/MM/DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6" class="searchBtn">
           <el-form-item>
             <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
             <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -34,12 +47,15 @@
         </el-col>
       </el-row>
     </el-form>
-    <el-table v-loading="loading" :data="recordList" ref="infoTableRef" highlight-current-row @row-click="(row) => tableInfoRowClick(row, infoTableRef)" border show-overflow-tooltip>
+    <el-table v-loading="loading" :data="recordList" ref="infoTableRef" highlight-current-row
+      @row-click="(row) => tableInfoRowClick(row, infoTableRef)" border show-overflow-tooltip>
       <el-table-column label="序号" align="center" type="index" width="70" />
+      <el-table-column label="物料号" align="center" prop="wlNo" />
       <el-table-column label="物料描述" align="center" prop="wlMs" />
       <el-table-column label="供应商" align="center" prop="gysMc" />
       <el-table-column label="项目编号" align="center" prop="xmNo" />
       <el-table-column label="项目描述" align="center" prop="xmMs" />
+      <el-table-column label="订单编号" align="center" prop="sapNo" />
       <el-table-column label="移库数量" align="center" prop="realQty" />
       <el-table-column label="原仓库" align="center" prop="fromCangkuName" />
       <el-table-column label="原库位码" align="center" prop="fromPcode" />
@@ -50,45 +66,35 @@
       <el-table-column label="身份码" align="center" prop="entityId" />
       <el-table-column label="移库人" align="center" prop="movedByName" />
       <el-table-column label="移库原因" align="center" prop="moveReason" />
-      <el-table-column
+      <el-table-column label="移库时间" align="center" prop="createTime" />
-        label="操作"
+      <el-table-column label="操作" align="center" width="80" fixed="right">
-        align="center"
-        width="80"
-        fixed="right"
-      >
         <template #default="scope">
-          <el-button link type="primary" @click="delData(scope.row)"
+          <el-button link type="primary" @click="delData(scope.row)">撤销</el-button>
-            >撤销</el-button
-          >
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
-      v-show="total>0"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
 
   </div>
 </template>
 
 <script setup name="Move">
 import { listRecord, delMove } from "@/api/wisdom/move";
-import {warehouseDict} from "@/api/information/warehouseinfo";    //所属仓库
+import { warehouseDict } from "@/api/information/warehouseinfo";    //所属仓库
 
 const proxy = getCurrentInstance().proxy;
+const optionTime = ref([]);
 
 // 显示搜索条件
 const showSearch = ref(true);
 
 // 所属仓库下拉数据
 const warehouseList = ref([]);
-const warehouseFun = () =>{
+const warehouseFun = () => {
   //所属仓库下拉数据
-  warehouseDict().then(response=>{
+  warehouseDict().then(response => {
     warehouseList.value = response.data
   })
 }
@@ -103,7 +109,7 @@ const queryParams = ref({
   pageSize: 10,
   fromCangku: null,
   toCangku: null,
-  xmNo:null
+  xmNo: null
 });
 // 总条数
 const total = ref(0);
@@ -124,21 +130,36 @@ getList();
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.value.pageNum = 1;
+  //操作时间
+  if (optionTime.value && optionTime.value.length > 0) {
+    queryParams.value.startDate = optionTime.value[0]
+    queryParams.value.endDate = optionTime.value[1]
+  } else {
+    queryParams.value.startDate = ""
+    queryParams.value.endDate = ""
+  }
   getList();
 }
 
 /** 重置按钮操作 */
 const resetQuery = () => {
+  optionTime.value = []
   proxy.resetForm("queryForm");
   handleQuery();
 }
 
 const delData = (row) => {
-  proxy.$modal.confirm('确定撤销该条移库记录吗？').then(function() {
+  proxy.$modal.confirm('确定撤销该条移库记录吗？').then(function () {
     return delMove(row.id);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => { });
 }
 </script>
+<style scoped>
+.searchBtn {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>

src/views/wisdom/outbound/index.vue

@@ -136,8 +136,9 @@
               }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="备注" align="center" prop="remark" width="200" />
+
           <el-table-column label="库位码" align="center" prop="pcode" width="120" />
+          <el-table-column label="备注" align="center" prop="remark" width="200" />
           <el-table-column label="托盘码" align="center" prop="trayCode" />
           <el-table-column label="身份码" align="center" prop="entityId" width="200" />
           <el-table-column label="物资类型" align="center" prop="wlTypeName" />
@@ -318,16 +319,16 @@
         <el-table-column label="单价" align="center" prop="htDj" />
         <el-table-column label="单位" align="center" prop="dw" />
         <el-table-column label="库位" align="center" prop="pcode" width="150"></el-table-column>
-        <el-table-column label="项目定义号" align="center" prop="xmNo" width="150" />
-        <el-table-column label="项目名称" align="center" prop="xmMs" width="250" />
-        <el-table-column label="供应商" align="center" prop="gysMc" width="200" />
-        <el-table-column label="容器码" align="center" prop="trayCode"></el-table-column>
-        <el-table-column label="身份码" align="center" prop="entityId" width="200"></el-table-column>
         <el-table-column label="备注" align="center" width="200">
           <template #default="scope">
             <el-input v-model="scope.row.remark" placeholder="请输入备注"></el-input>
           </template>
         </el-table-column>
+        <el-table-column label="项目定义号" align="center" prop="xmNo" width="150" />
+        <el-table-column label="项目名称" align="center" prop="xmMs" width="250" />
+        <el-table-column label="供应商" align="center" prop="gysMc" width="200" />
+        <el-table-column label="容器码" align="center" prop="trayCode"></el-table-column>
+        <el-table-column label="身份码" align="center" prop="entityId" width="200"></el-table-column>
         <el-table-column label="一次封样号" align="center" prop="fycde1" width="150" />
         <el-table-column label="二次封样号" align="center" prop="fycde2" width="150" />
         <el-table-column label="上传" align="center" width="150" v-if="isExamine == 1">