fix:多流转卡号下拉框修复，订单数量在报故单情况下直接取值报故单

src/api/fault/index.ts

@@ -62,10 +62,11 @@ export function handleEscalationFault(data: FaultHandle): AxiosPromise<any> {
      * @param id
      * @param data
      */
-    export function getProcessInfoList(seqNo:String) {
+    export function getProcessInfoList(data:Object) {
       return request({
-        url: "/api/v1/process/info/list?seqNo="+seqNo ,
-        method: "get",
+        url: "/api/v1/process/info/list" ,
+        method: "post",
+        data:data,
       });
 }
 

src/views/base/skill/components/edit-skill.vue

@@ -80,30 +80,17 @@ const ctableRef = ref(null); //crudRef.value 获取avue-crud对象
 const router = useRouter();
 onMounted(() => {
   // console.log("crudRef", crudRef)
-  nextTick(async () => {
-    await step1();
-    await step2();
-  })
-
-
+  getSkillDetail(props.skillId).then(
+    (data)=>{
+      data2.value=data.data;
+    }
+  )
+  dataNoPageList();
 
 
 
 });
-const step1=()=>{
-  return new Promise((getSkillDetail)=>{
-    getSkillDetail(props.skillId).then(
-      (data)=>{
-        postIdSkill.value.postId=data.data.postId;
-      }
-    );
-  })
-}
-const step2=()=>{
-  return new Promise((dataNoPageList)=>{
-    dataNoPageList();
-  })
-}
+
 const skillChange=(row)=>{
   if(skillValue.value!==undefined&&skillValue.value!==null&&skillValue.value!==""){
     data.value[row.$index].skillDictValue=skillValue.value;
@@ -163,7 +150,6 @@ const onHandle=()=>{
   employeeSkill.value.userId=form.value.userId;
   employeeSkill.value.postId=form.value.postId;
   employeeSkill.value.skillList=Array.from(data.value);
-  console.info("11",employeeSkill.value)
   addEmployeeSkill(employeeSkill.value).then(
     (data)=>{
       if(data.code==="200") {
@@ -183,7 +169,6 @@ const onHandle=()=>{
   )
 
 }
-const postIdValue=ref(null);
 // 设置表格列或者其他自定义的option
 option2.value = {
   selection: true,
@@ -255,6 +240,12 @@ const props = defineProps({
     default:()=>{
       return "0";
     }
+  },
+  postId:{
+    type:Number,
+    default:()=>{
+      return "0";
+    }
   }
 
 })
@@ -275,7 +266,7 @@ option.value = Object.assign(option.value,{
     headerAlign: 'center',
     span:24,
     type: 'select',
-    dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/postSkill/list/"+postIdSkill.value.postId,
+    dicUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/sys/postSkill/list/"+props.postId,
     props: {
       label: "userName", // 下拉菜单显示的字段
       value: "userName", // 下拉菜单值的字段

src/views/base/skill/index.vue

@@ -57,7 +57,7 @@
       :destroy-on-close="true"
       @close="editDialog.visible = false"
     >
-      <editSkill   :editDialog="editDialog" :skillId="editUser.id"/>
+      <editSkill   :editDialog="editDialog" :skillId="editUser.id" :postId="editUser.postId"/>
     </el-dialog>
   </div>
 </template>

src/views/plan/order/index.vue

@@ -259,10 +259,12 @@ option.value = {
         if(value==='2'){
           option.value.column[4].display=true;
           option.value.column[6].disabled=true;
+          option.value.column[10].disabled=true;
         }
         if(value==='1'){
           option.value.column[4].display=false;
           option.value.column[6].disabled=false;
+          option.value.column[10].disabled=false;
         }
       },
     },
@@ -518,6 +520,17 @@ const handleQuery = (params, done) => {
 const resetQuery = () => {};
 const rowSave = (form, done, loading) => {
   loading();
+  if(form.value.orderType==2||form.value.orderType=="2"){
+    if(form.value.trackingNumber==undefined||form.value.trackingNumber==null){
+      ElMessage({
+        message: "未选择报故单",
+        type: "error",
+      });
+    }
+    done();
+    return false;
+  }
+
   addOrder(form).then((data: any) => {
     ElMessage({
       message: data.msg,
@@ -641,5 +654,6 @@ const onSelectedFinish=(selectedValue)=>{
   form.value.materialModel=selectedValue.spec;
   form.value.faultId=selectedValue.id;
   form.value.trackingNumber=selectedValue.trackingNumber;
+  form.value.orderNum=selectedValue.unqualifiedNum;
 }
 </script>

src/views/quality/faultHandle/components/fault-handle.vue

@@ -149,27 +149,7 @@
     });
 
   });
-  /*watch(
-    () => props.escalationId,
-    ()=>{
-      search.value.escalationFaultId=props.escalationId;
-      dataNoPageList();
-      formData.value.escalationFaultId=props.escalationId;
-      getFault(formData.value).then((data) => {
 
-        faultImg.value=data.data;
-      });
-      getFaultDetails(props.escalationId).then((data) => {
-
-        faultDetails.value=data.data;
-        for(let i=0;i<dicts.disposal_measures_type.length;i++){
-          if(faultDetails.value.disposalMeasures===dicts.disposal_measures_type[i].dictValue){
-            faultDetails.value.disposalMeasures=dicts.disposal_measures_type[i].dictLabel;
-          }
-        }
-      });
-    }
-  );*/
 const faultHandle=ref({});
  const onHandle=()=>{
    faultHandle.value.id=faultDetails.value.id;

src/views/quality/faultHandle/components/fault-page.vue

@@ -62,9 +62,9 @@
       :option="option2"
     >
       <template #processInfo="{row,index,type}">
-        <el-select v-model="value" placeholder="请选择" @click="getFaults(row)" @change="listData(row)">
+        <el-select v-model="value[row.$index]" placeholder="请选择" @click="getFaults(row)" @change="listData(row)">
           <el-option
-            v-for="item in optionFault"
+            v-for="item in optionFault[row.$index]"
             :key="item.value"
             :label="item.operationName"
             :value="item.id"
@@ -109,7 +109,13 @@
       default:()=>{
         return {};
       }
-    }
+    },
+    workOrderCode: {
+      type: String,
+      default: () => {
+        return 0;
+      }
+    },
   })
 
   // 传入一个url，后面不带/
@@ -169,11 +175,10 @@
   });
 
 const listData=(row)=>{
-  for(let i=0;i<postDetail.value.length;i++){
-    if(postDetail.value[i].seqNo===row.seqNo){
-      postDetail.value[i].reworkProcessId=value.value;
-    }
-  }
+
+  postDetail.value[row.$index].reworkProcessId=value.value[row.$index];
+  postDetail.value[row.$index].workOrderCode=props.workOrderCode;
+
 }
 const faultHandle=ref({});
  const onHandle=()=>{
@@ -186,14 +191,16 @@ const faultHandle=ref({});
        return;
      }
    }
-   rework(postDetail.value).then(
+   faultHandle.value.reworkList=Array.from(postDetail.value);
+   faultHandle.value.faultId=props.faultId;
+   rework(faultHandle.value).then(
      (data)=> {
        if (data.code === "200") {
          ElMessage({
            message: data.msg,
            type: "success",
          });
-         props.dia.visible = false;
+         props.dial.visible = false;
        }
        else {
          ElMessage({
@@ -229,16 +236,20 @@ const faultHandle=ref({});
     ],
   });
   const optionFault=ref([]);
+  const processFault=ref({});
   const getFaults=(row)=>{
-    console.log("row",row);
-    getProcessInfoList(row.seqNo).then(
+
+    processFault.value.seqNo=row.seqNo;
+    processFault.value.workOrderCode=props.workOrderCode;
+    getProcessInfoList(processFault.value).then(
       (data)=>{
-        optionFault.value=data.data;
+        optionFault.value[row.$index]=data.data;
       }
     )
   }
   const option2=ref(null);
-  const value=ref(null);
+  const value=ref([]);
+
   // 设置表格列或者其他自定义的option
   option2.value = {
     addBtn: false,
@@ -265,7 +276,6 @@ const faultHandle=ref({});
     ],
   };
   const cancelWindow=()=>{
-    console.info(props);
     props.dial.visible=false;
   }
 

src/views/quality/faultHandle/index.vue

@@ -68,7 +68,7 @@
       v-model="dialog1.visible"
       :title="dialog1.title"
       width="900px"
-      @close="dialog1.visible = false"
+      @close="closeFaultDetail"
       :destroy-on-close="true"
     >
       <fault-handle  :escalationId="faultInfo.id" :dia="dialog1" />
@@ -78,10 +78,10 @@
       v-model="dialog2.visible"
       :title="dialog2.title"
       width="900px"
-      @close="dialog2.visible = false"
+      @close="closeFaultHandel"
       :destroy-on-close="true"
     >
-      <fault-page  :faultId="faultEs.id" :dial="dialog2" />
+      <fault-page  :faultId="faultEs.id" :dial="dialog2" :workOrderCode="faultEs.workOrderCode"/>
     </el-dialog>
 
     <el-dialog
@@ -126,6 +126,15 @@
     title: "审核",
     visible: false,
   });
+
+  const closeFaultDetail=()=>{
+    dialog1.visible = false;
+    dataList();
+  }
+  const closeFaultHandel=()=>{
+    dialog2.visible = false;
+    dataList();
+  }
   const fault=ref({});
   const faultInfo=ref({});
   const faultEs=ref({});
@@ -137,7 +146,7 @@
     dialog1.value.visible=true;
   }
   const faultThaw=(row)=>{
-    faultEs.value.id=row.id;
+    faultEs.value=row;
     dialog2.value.visible=true;
   }