领料更改

src/api/order/index.ts

@@ -176,3 +176,11 @@ export function revokeWorkOrder(workOrderId: any) {
     method: "get",
   });
 }
+
+export function queryWorkOrderList(params: any) {
+  return request({
+    url: "/api/v1/plan/workOrder/list",
+    method: "post",
+    data: params
+  });
+}

src/views/plan/requisition/index.vue

@@ -74,22 +74,23 @@
             <el-col :span="6" ><el-text tag="p" >{{form.applyOrg}}</el-text></el-col>
             <el-col :span="2" ><el-text tag="p">发件单位: </el-text></el-col>
             <el-col :span="6" ><el-text tag="p" >{{form.sendOrg}} </el-text></el-col>
-            <el-col :span="2" ><el-text tag="p">计划编号:</el-text></el-col>
+            <el-col :span="2" ><el-text tag="p">工单编号:</el-text></el-col>
             <el-col :span="6">
-              <el-text tag="p" v-if="dialogType === 1 || form.state > 0">{{form.orderCode}}</el-text>
+              <el-text tag="p" v-if="dialogType === 1 || form.state > 0">{{form.workOrderCode}}</el-text>
               <el-select
                   v-else
                   size="small"
-                  v-model="form.orderCode"
-                  placeholder="请选择计划单号"
+                  v-model="form.workOrderCode"
+                  placeholder="请选择工单单号"
                   clearable
+                  filterable
                   @change="changeOrder"
               >
                 <el-option
                     v-for="option in orderList"
-                    :key="option.orderCode"
-                    :label="option.orderCode"
-                    :value="option.orderCode"
+                    :key="option.workOrderCode"
+                    :label="option.workOrderCode"
+                    :value="option.workOrderCode"
                 />
               </el-select>
             </el-col>
@@ -114,6 +115,11 @@
                 <el-input v-else v-model="row.num" type="number"/>
               </template>
             </el-table-column>
+            <el-table-column label="实际接收" align="receiveNum" v-if="form.state === '6' || form.state === '8'">
+              <template v-slot="{row}">
+                <el-text>{{row.receiveNum}}</el-text>
+              </template>
+            </el-table-column>
             <el-table-column label="备注" align="remark">
               <template v-slot="{row}">
                 <el-text v-if="dialogType === 1 || form.state > 0">{{row.remark}}</el-text>
@@ -303,7 +309,7 @@ import { ref, getCurrentInstance } from "vue";
 import { html2CanvasPrint } from "@/utils/common";
 import { useCrud } from "@/hooks/userCrud";
 import dictDataUtil from "@/common/configs/dictDataUtil";
-import {queryApplyInfoDetails,queryOrderList,saveApplyInfoDetails,auditApplyInfoDetails} from "@/api/order"
+import {queryApplyInfoDetails,queryWorkOrderList,saveApplyInfoDetails,auditApplyInfoDetails} from "@/api/order"
 import {getUserList} from "@/api/system/user"
 import { useCommonStoreHook } from "@/store";
 const { isShowTable, tableType } = toRefs(useCommonStoreHook());
@@ -327,7 +333,7 @@ const minusItem =(row)=>{
   tableDataList.value = tableDataList.value.filter(item=>item.id !== row.id)
 }
 const changeOrder =(val)=>{
-  queryApplyInfoDetails({orderCode: val}).then((data)=>{
+  queryApplyInfoDetails({workOrderCode: val}).then((data)=>{
     tableDataList.value = data.data
   })
 }
@@ -497,6 +503,13 @@ option.value = Object.assign(option.value, {
       overHidden: true,
     },
     {
+      label: "工单单号",
+      prop: "workOrderCode",
+      search: true,
+      width: 150,
+      overHidden: true,
+    },
+    {
       label: "计划单号",
       prop: "orderCode",
       search: true,
@@ -561,7 +574,7 @@ option.value = Object.assign(option.value, {
 });
 
 onMounted(() => {
-  queryOrderList({}).then((data)=>{
+  queryWorkOrderList({}).then((data)=>{
     if(!data.data){
       ElMessage.warning("请维护物料BOM")
     }