Merge branch 'master' of http://120.46.159.163:7400/ezhizao/ezhizao_dms_vue

src/views/business/noCurrentReject/DialogRejectInfo.vue

@@ -72,13 +72,13 @@
         label-width="80px">
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="发现工段" label-width="80px" prop="findDeptId">
+            <el-form-item label="发现工段" label-width="80px" prop="findDeptName">
               <el-select-v2 v-model="detailInfo.findDeptName" :options="deptList" placeholder="请选择工段"
                 @change="getFindProcess" style="width: 140px" />
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="发现工序" label-width="100px" prop="findTechnologicalProcessId">
+            <el-form-item label="发现工序" label-width="100px" prop="findTechnologicalProcessName">
               <el-select-v2 v-model="detailInfo.findTechnologicalProcessName" :options="findProcessList"
                 @change="selectFindProcess" placeholder="请选择工序" :disabled="detailInfo.findDeptId == null"
                 style="width: 140px">
@@ -140,7 +140,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="责任工序" label-width="100px" prop="technologicalProcessId">
+            <el-form-item label="责任工序" label-width="100px" prop="technologicalProcessName">
               <el-select-v2 v-model="detailInfo.technologicalProcessName" :options="processList" placeholder="请选择工序"
                 :disabled="detailInfo.deptId == null" @change="selectProcess" style="width: 140px">
                 <template #default="{ index, item }">
@@ -209,13 +209,13 @@ const data = reactive({
   form: {},
   rules: {
     deptId: [{ required: true, message: "责任工段不能为空", trigger: "blur" }],
-    technologicalProcessId: [
+    technologicalProcessName: [
       { required: true, message: "责任工序不能为空", trigger: "blur" },
     ],
-    findDeptId: [
+    findDeptName: [
       { required: true, message: "发现工段不能为空", trigger: "blur" },
     ],
-    findTechnologicalProcessId: [
+    findTechnologicalProcessName: [
       { required: true, message: "发现工序不能为空", trigger: "blur" },
     ],
     rejectNum: [{ required: true, message: "废品不能为空", trigger: "blur" }],

src/views/business/returnTurnover/index.vue

@@ -187,6 +187,8 @@ function handleShowTurnoverDialog(row) {
 			console.log(needCheckProcessCodeList)
 			console.log(returnReceiptProcessCodeList)
 			console.log(process)
+			process.sort((a, b) => (a.processStepNumber > b.processStepNumber ? 1 : -1))
+			console.log('process', process)
 			if (process.length > 0) {
 				getProcessInspectionList(process[process.length - 1]).then(res => {
 					if (res.code == 200) {
@@ -279,6 +281,8 @@ async function handleBatchTurnover() {
 			console.log('needCheckProcessCodeList', needCheckProcessCodeList)
 			console.log('returnReceiptProcessCodeList', returnReceiptProcessCodeList)
 			console.log('process', process)
+			process.sort((a, b) => (a.processStepNumber > b.processStepNumber ? 1 : -1))
+			console.log('process', process)
 			if (process.length > 0) {
 				getProcessInspectionLists(process).then(res => {
 					if (res.code == 200) {