Merge branch 'qingban' of http://192.168.101.4:3000/jiaxiaoqiang/JG-ADMIN-TEMP into qingban

src/views/plan/workOrder/components/check-task.vue

@@ -68,6 +68,7 @@
             v-model="taskForm.baseFormIds"
             multiple
             placeholder="Select"
+            @change="onTaskFormIdChange"
           >
             <el-option
               v-for="item in options"
@@ -122,7 +123,7 @@ const taskForm = ref({
   formName: "",
   baseFormIds: "",
   workOrderId: "",
-  info:{}
+  info: {},
 });
 const rules = reactive({
   formName: [{ required: true, trigger: "blur" }],
@@ -139,7 +140,22 @@ const props = defineProps({
     },
   },
 });
+
+const onTaskFormIdChange = () => {
+  //   如果taskForm.formName是空的
+  if (!taskForm.value.formName) {
+    if (taskForm.value.baseFormIds.length > 0) {
+      options.value.forEach((element) => {
+        if (element.value == taskForm.value.baseFormIds[0]) {
+          taskForm.value.formName = element.label;
+        }
+      });
+    }
+  }
+};
+
 const handleClose = () => {
+  taskFormRef.value.resetFields();
   editDialog.value.visible = false;
   value1.value = [];
 };
@@ -177,8 +193,6 @@ const onSelected = () => {
           ElMessage.success("添加成功！");
           dataList();
           handleClose();
-          taskForm.value.baseFormIds = [];
-          taskForm.value.formName = "";
         } else {
           ElMessage.error(data.msg);
         }

src/views/storage/semi/index.vue

@@ -114,7 +114,7 @@ const materialInfo2 = (value) => {
   dialog2.visible = false;
 };
 const seqDisabled = computed(() => {
-  return !form.value.workOrderCodeId;
+  return !form.value.workOrderId;
 });
 // 设置表格列或者其他自定义的option
 option.value = Object.assign(option.value, {