Merge remote-tracking branch 'origin/master'

sample-form-manager-ui/admin/src/pages/hardware/NumberWriteDevice.vue

@@ -212,6 +212,7 @@ export default {
         page: this.current,
         size: this.size,
         deviceName: `%${this.searchVal}%`,
+        productName: "样表机",
       });
       this.loading = false;
       let { data } = res.data.data;

sample-form-manager-ui/admin/src/pages/software/materials/modal/AddMaterials.vue

@@ -5,6 +5,7 @@
       :visible.sync="Visible"
       width="30%"
       @close="handleClose"
+      :destroy-on-close="true"
     >
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="材料简称" prop="materialName">

sample-form-manager-ui/admin/src/pages/software/materials/modal/CommonLib.vue

 <template>
   <div>
-    <el-dialog title="从公共库中选择" :visible.sync="Visible" width="70%">
+    <el-dialog
+      :destroy-on-close="true"
+      title="从公共库中选择"
+      :visible.sync="Visible"
+      width="70%"
+    >
       <TableHeader>
         <div slot="right" class="flex">
           <el-input

sample-form-manager-ui/admin/src/pages/software/materials/modal/PreviewMaterials.vue

@@ -5,6 +5,7 @@
       :visible.sync="Visible"
       size="50%"
       @close="handleClose"
+      :destroy-on-close="true"
     >
       <div class="main flex">
         <div class="left flex flexc jcc aic">

sample-form-manager-ui/admin/src/pages/software/matter/modal/AddMatter.vue

@@ -3,6 +3,7 @@
     <el-dialog
       :title="title"
       :visible.sync="Visible"
+      :destroy-on-close="true"
       width="30%"
       @close="handleClose"
     >
@@ -35,6 +36,7 @@
             v-model="form.deptCode"
             placeholder="请选择部门"
             @change="handleChange"
+            filterable
           >
             <el-option
               v-for="v in departmentList"

sample-form-manager-ui/admin/src/router/index.js

@@ -108,20 +108,20 @@ const dynamicRouter = [
       },
     ],
   },
-  {
-    path: "/skinmanage",
-    component: Layouts,
-    meta: {
-      icon: "el-icon-orange",
-      title: "皮肤管理",
-    },
-    children: [
-      {
-        path: "",
-        component: () => import("@/pages/software/skinManage/SkinManage"),
-      },
-    ],
-  },
+  // {
+  //   path: "/skinmanage",
+  //   component: Layouts,
+  //   meta: {
+  //     icon: "el-icon-orange",
+  //     title: "皮肤管理",
+  //   },
+  //   children: [
+  //     {
+  //       path: "",
+  //       component: () => import("@/pages/software/skinManage/SkinManage"),
+  //     },
+  //   ],
+  // },
   {
     path: "/numberwritedevice",
     component: Layouts,