工厂配置模块

src/views/iot/base/equipment/index.vue

@@ -329,7 +329,8 @@ const submitForm = () => {
 };
 
 const getDtl = (row) => {
-  modalType = "edit";
+  modalType.value = "edit";
+
   proxy.post("/tdaDevice/detail", { id: row.id }).then((res) => {
     formData.data = res;
     console.log(formData);

src/views/iot/base/product/index.vue

@@ -330,7 +330,7 @@ const submitForm = () => {
 };
 
 const getDtl = (row) => {
-  modalType = "edit";
+  modalType.value = "edit";
   proxy.post("/tdaProduct/detail", { id: row.id }).then((res) => {
     formData.data = res;
     console.log(formData);

src/views/production/factory/farm/index.vue

@@ -74,8 +74,11 @@ const sourceList = ref({
 let dialogVisible = ref(false);
 let modalType = ref("add");
 let rules = ref({
-  name: [{ required: true, message: "请选择车间类型", trigger: "change" }],
-  endPoint: [{ required: true, message: "请输入车间名称", trigger: "blur" }],
+  type: [{ required: true, message: "请选择车间类型", trigger: "change" }],
+  name: [{ required: true, message: "请输入车间名称", trigger: "blur" }],
+  personLiableId: [
+    { required: true, message: "请选择负责人", trigger: "change" },
+  ],
 });
 const { proxy } = getCurrentInstance();
 const selectConfig = reactive([
@@ -84,15 +87,15 @@ const selectConfig = reactive([
     prop: "type",
     data: [
       {
-        label: "审核中",
+        label: "普通车间",
         value: "1",
       },
       {
-        label: "审核通过",
+        label: "半自动化车间",
         value: "2",
       },
       {
-        label: "审核不通过",
+        label: "自动化车间",
         value: "3",
       },
     ],
@@ -105,9 +108,15 @@ const config = computed(() => {
         label: "车间类型",
         prop: "type",
         width: 120,
-        render(type) {
-          return "华为";
-        },
+      },
+      render(type) {
+        return type == 1
+          ? "普通车间"
+          : type == 2
+          ? "半自动化车间"
+          : type == "3"
+          ? "自动化车间"
+          : "";
       },
     },
     {
@@ -120,7 +129,7 @@ const config = computed(() => {
     {
       attrs: {
         label: "负责人",
-        prop: "personLiableId",
+        prop: "personLiableName",
         width: 100,
       },
     },
@@ -206,36 +215,56 @@ const formConfig = computed(() => {
   return [
     {
       type: "select",
-      prop: "name",
+      prop: "type",
       label: "车间类型",
       required: true,
-      isLoad: {
-        url: "/tdaApplication/page",
-        req: {
-          pageNum: 1,
-          pageSize: 9999,
+      data: [
+        {
+          label: "普通车间",
+          value: "1",
         },
-        labelKey: "appName",
-        labelVal: "id",
-        method: "post",
-        resUrl: "rows",
-      },
+        {
+          label: "半自动化车间",
+          value: "2",
+        },
+        {
+          label: "自动化车间",
+          value: "3",
+        },
+      ],
+      // isLoad: {
+      //   url: "/tdaApplication/page",
+      //   req: {
+      //     pageNum: 1,
+      //     pageSize: 9999,
+      //   },
+      //   labelKey: "appName",
+      //   labelVal: "id",
+      //   method: "post",
+      //   resUrl: "rows",
+      // },
     },
     {
       type: "input",
-      prop: "aa",
+      prop: "name",
       label: "车间名称",
       required: true,
     },
     {
       type: "select",
-      prop: "name",
+      prop: "personLiableId",
       label: "负责人",
-      data: [],
+      isLoad: {
+        url: "/tenantUser/list?pageNum=1&pageSize=10000",
+        labelKey: "userName",
+        labelVal: "userId",
+        method: "get",
+        resUrl: "rows",
+      },
     },
     {
       type: "input",
-      prop: "secretAccessKey",
+      prop: "remarks",
       label: "车间说明",
       itemType: "textarea",
     },
@@ -273,14 +302,18 @@ const submitForm = () => {
         submitLoading.value = false;
         getList();
       },
-      (err) => (submitLoading.value = false)
+      (err) => {
+        console.log(err, "aswwwww");
+        submitLoading.value = false;
+      }
     );
   });
 };
 
 const getDtl = (row) => {
-  modalType = "edit";
+  modalType.value = "edit";
   proxy.post("/workshop/detail", { id: row.id }).then((res) => {
+    res.type = res.type + "";
     formData.data = res;
     console.log(formData);
     dialogVisible.value = true;

src/views/production/factory/line/index.vue

@@ -75,35 +75,45 @@ let dialogVisible = ref(false);
 let roomDialogVisible = ref(false);
 let modalType = ref("add");
 let rules = ref({
-  name: [{ required: true, message: "请选择车间名称", trigger: "change" }],
-  name: [{ required: true, message: "请选择产线类型", trigger: "change" }],
-  endPoint: [{ required: true, message: "请输入产线名称", trigger: "blur" }],
+  workshopId: [
+    { required: true, message: "请选择车间名称", trigger: "change" },
+  ],
+  type: [{ required: true, message: "请选择产线类型", trigger: "change" }],
+  name: [{ required: true, message: "请输入产线名称", trigger: "blur" }],
 });
 const { proxy } = getCurrentInstance();
-const selectConfig = computed(() => {
-  return [
-    {
-      label: "车间",
-      prop: "workshopId",
-      data: [],
-    },
-    {
-      label: "产线类型",
-      prop: "type",
-      data: [],
-    },
-  ];
-});
+const selectConfig = reactive([
+  {
+    label: "车间",
+    prop: "workshopId",
+    data: [],
+  },
+  {
+    label: "产线类型",
+    prop: "type",
+    data: [
+      {
+        label: "普通产线",
+        value: "1",
+      },
+      {
+        label: "半自动化产线",
+        value: "2",
+      },
+      {
+        label: "自动化产线",
+        value: "3",
+      },
+    ],
+  },
+]);
 const config = computed(() => {
   return [
     {
       attrs: {
         label: "车间名称",
-        prop: "workshopId",
+        prop: "workshopName",
         width: 120,
-        render(type) {
-          return "华为";
-        },
       },
     },
     {
@@ -112,18 +122,27 @@ const config = computed(() => {
         prop: "type",
         width: 150,
       },
+      render(type) {
+        return type == 1
+          ? "普通产线"
+          : type == 2
+          ? "半自动化产线"
+          : type == "3"
+          ? "自动化产线"
+          : "";
+      },
     },
     {
       attrs: {
         label: "产线名称",
         prop: "name",
-        width: 100,
+        width: 150,
       },
     },
     {
       attrs: {
         label: "负责人",
-        prop: "personLiableId",
+        prop: "personLiableName",
         width: 100,
       },
     },
@@ -194,9 +213,7 @@ const config = computed(() => {
 });
 
 let formData = reactive({
-  data: {
-    type: "",
-  },
+  data: {},
 });
 const formOption = reactive({
   inline: true,
@@ -213,14 +230,37 @@ const formConfig = computed(() => {
       prop: "workshopId",
       label: "车间名称",
       required: true,
-      data: [],
+      isLoad: {
+        url: "/workshop/page",
+        req: {
+          pageNum: 1,
+          pageSize: 9999,
+        },
+        labelKey: "name",
+        labelVal: "id",
+        method: "post",
+        resUrl: "rows",
+      },
     },
     {
       type: "select",
       prop: "type",
       label: "产线类型",
       required: true,
-      data: [],
+      data: [
+        {
+          label: "普通产线",
+          value: "1",
+        },
+        {
+          label: "半自动化产线",
+          value: "2",
+        },
+        {
+          label: "自动化产线",
+          value: "3",
+        },
+      ],
     },
     {
       type: "input",
@@ -232,7 +272,13 @@ const formConfig = computed(() => {
       type: "select",
       prop: "personLiableId",
       label: "负责人",
-      data: [],
+      isLoad: {
+        url: "/tenantUser/list?pageNum=1&pageSize=10000",
+        labelKey: "userName",
+        labelVal: "userId",
+        method: "get",
+        resUrl: "rows",
+      },
     },
     {
       type: "input",
@@ -260,6 +306,7 @@ const openModal = () => {
   dialogVisible.value = true;
   modalType.value = "add";
   formData.data = {};
+  console.log(formData.data, "awss");
 };
 
 const submitForm = () => {
@@ -282,15 +329,32 @@ const submitForm = () => {
 };
 
 const getDtl = (row) => {
-  modalType = "edit";
+  modalType.value = "edit";
   proxy.post("/assemblyLine/detail", { id: row.id }).then((res) => {
+    res.type = res.type + "";
     formData.data = res;
     console.log(formData);
     dialogVisible.value = true;
   });
 };
 
+const selectData = reactive({
+  farmList: [],
+});
+const getSelect = () => {
+  proxy
+    .post("/workshop/page", { pageNum: 1, pageSize: 9999 })
+    .then((message) => {
+      selectData.farmList = message.rows;
+      selectConfig[0].data = selectData.farmList.map((x) => ({
+        label: x.name,
+        value: x.id,
+      }));
+    });
+};
+
 getList();
+getSelect();
 </script>
   
 <style lang="scss" scoped>