inl-ui 0.0.37 → 0.0.39

package/src/pageComponent/views/workforceManager/workforceRule/components/{workforceRule.tsx → workforceRuleComp.tsx}

@@ -1,234 +1,236 @@
-import { defineComponent, ref } from "vue";
-import { message, Modal } from "ant-design-vue";
-import Rule from "./rule";
-import useTableList from "@/pageComponent/hooks/useTableList";
-
-import workforceApi from "@/api/workforceManager";
-
-const columns = [
-  {
-    title: "排班编码",
-    dataIndex: "code",
-    key: "code",
-  },
-  {
-    title: "部门",
-    dataIndex: "depName",
-    key: "depName",
-  },
-  {
-    title: "所选班制",
-    dataIndex: "shiftSysName",
-    key: "shiftSysName",
-  },
-  {
-    title: "最后修改人",
-    dataIndex: "updateUser",
-    key: "updateUser",
-  },
-  {
-    title: "最后修改时间",
-    dataIndex: "updateDt",
-    key: "updateDt",
-  },
-  {
-    title: "操作",
-    dataIndex: "operation",
-  },
-];
-
-export default defineComponent({
-  setup() {
-    const {
-      currPage,
-      isLoading,
-      refresh,
-      tableList,
-      handlePageChange,
-      total,
-      hanldePageSizeChange,
-      pageSize,
-    } = useTableList(
-      () =>
-        workforceApi.getRuleList({
-          depId: searchFormState.value.depId,
-          jobPostId: searchFormState.value.jobPostId,
-          pageVo: { currentPage: currPage.value, pageSize: pageSize.value },
-        }),
-      "rows",
-      "total"
-    );
-
-    refresh();
-
-    const searchFormRef = ref();
-    const searchFormState = ref({
-      depId: "",
-      jobPostId: "",
-    });
-
-    // 岗位列表
-    const jobList = ref([]);
-
-    // 部门列表
-    const depList = ref([]);
-    const getDep = async () => {
-      const { data } = await workforceApi.getDepTree();
-      depList.value = data.departmentList;
-    };
-    getDep();
-
-    const changeDept = async () => {
-      const resp = await workforceApi.getPostByDepId(
-        searchFormState.value.depId
-      );
-      jobList.value = resp.data;
-      searchFormState.value.jobPostId = "";
-    };
-
-    const visible = ref(false);
-
-    // 当前规则
-    const currentRule = ref();
-    const handleEditClick = (row: any) => {
-      currentRule.value = row;
-      visible.value = true;
-    };
-
-    const handleDelClick = async (row: any) => {
-      const resp = await workforceApi.ruleRemove(row.code);
-      message.success("删除成功！");
-      refresh();
-    };
-
-    return () => (
-      <div class="classManager">
-        <a-form
-          model={searchFormState.value}
-          ref={searchFormRef}
-          name="basic"
-          labelCol={{ style: { width: "100px" } }}
-          autocomplete="off"
-        >
-          <a-row class="row" gutter={[16, 16]}>
-            <a-col span="6">
-              <a-form-item label="部门" name="depId">
-                <a-tree-select
-                  allowClear
-                  dropdownMatchSelectWidth={300}
-                  style={{ width: "100%" }}
-                  fieldNames={{
-                    label: "name",
-                    value: "id",
-                    children: "subList",
-                  }}
-                  treeData={depList.value}
-                  v-model={[searchFormState.value.depId, "value"]}
-                  onChange={changeDept}
-                ></a-tree-select>
-              </a-form-item>
-            </a-col>
-
-            <a-col span="6">
-              <a-form-item label="岗位" name="jobPostId">
-                <a-select
-                  v-model={[searchFormState.value.jobPostId, "value"]}
-                  allowClear
-                  style="width: 100%"
-                >
-                  {jobList.value.map((item: any, index: number) => (
-                    <a-select-option key={item.id} value={item.id}>
-                      {item.name}
-                    </a-select-option>
-                  ))}
-                </a-select>
-              </a-form-item>
-            </a-col>
-
-            <a-col span="12" style={{ textAlign: "right" }}>
-              <a-space>
-                <a-button type="primary" onClick={refresh}>
-                  查询
-                </a-button>
-                <a-button
-                  onClick={() => {
-                    searchFormRef.value.resetFields();
-                    refresh();
-                  }}
-                >
-                  重置
-                </a-button>
-              </a-space>
-            </a-col>
-          </a-row>
-        </a-form>
-
-        <a-row class="row">
-          <a-col span="6">
-            <a-button
-              type="primary"
-              onClick={() => {
-                currentRule.value = {};
-                visible.value = true;
-              }}
-            >
-              添加排班规则
-            </a-button>
-          </a-col>
-        </a-row>
-
-        <a-table
-          dataSource={tableList.value}
-          columns={columns}
-          pagination={{
-            current: currPage.value,
-            pageSize: pageSize.value,
-            showTotal: (num: number) => `共${num}条`,
-            showQuickJumper: true,
-            showSizeChanger: true,
-            total: total.value,
-            onChange: handlePageChange,
-            "onUpdate:current": handlePageChange,
-            "onUpdate:pageSize": hanldePageSizeChange,
-          }}
-          loading={isLoading.value}
-          v-slots={{
-            bodyCell: ({ column, record }) => {
-              if (column.dataIndex === "operation") {
-                return (
-                  <a-space>
-                    <a-button
-                      size="small"
-                      type="link"
-                      onClick={() => handleEditClick(record)}
-                    >
-                      编辑
-                    </a-button>
-
-                    <a-popconfirm
-                      title="确认删除？"
-                      onConfirm={() => {
-                        handleDelClick(record);
-                      }}
-                    >
-                      <a-button size="small" type="link">
-                        删除
-                      </a-button>
-                    </a-popconfirm>
-                  </a-space>
-                );
-              }
-            },
-          }}
-        />
-
-        <Rule
-          ruleCode={currentRule.value?.code}
-          depList={depList.value}
-          v-model={[visible.value, "visible"]}
-          onRefresh={refresh}
-        />
-      </div>
-    );
-  },
-});
+import { defineComponent, ref } from "vue";
+import { message, Modal } from "ant-design-vue";
+import Rule from "./rule";
+import useTableList from "@/pageComponent/hooks/useTableList";
+
+import workforceApi from "@/api/workforceManager";
+
+import "../assets/classManagerAndWorkforceRuleComp.less";
+
+const columns = [
+  {
+    title: "排班编码",
+    dataIndex: "code",
+    key: "code",
+  },
+  {
+    title: "部门",
+    dataIndex: "depName",
+    key: "depName",
+  },
+  {
+    title: "所选班制",
+    dataIndex: "shiftSysName",
+    key: "shiftSysName",
+  },
+  {
+    title: "最后修改人",
+    dataIndex: "updateUser",
+    key: "updateUser",
+  },
+  {
+    title: "最后修改时间",
+    dataIndex: "updateDt",
+    key: "updateDt",
+  },
+  {
+    title: "操作",
+    dataIndex: "operation",
+  },
+];
+
+export default defineComponent({
+  setup() {
+    const {
+      currPage,
+      isLoading,
+      refresh,
+      tableList,
+      handlePageChange,
+      total,
+      hanldePageSizeChange,
+      pageSize,
+    } = useTableList(
+      () =>
+        workforceApi.getRuleList({
+          depId: searchFormState.value.depId,
+          jobPostId: searchFormState.value.jobPostId,
+          pageVo: { currentPage: currPage.value, pageSize: pageSize.value },
+        }),
+      "rows",
+      "total"
+    );
+
+    refresh();
+
+    const searchFormRef = ref();
+    const searchFormState = ref({
+      depId: "",
+      jobPostId: "",
+    });
+
+    // 岗位列表
+    const jobList = ref([]);
+
+    // 部门列表
+    const depList = ref([]);
+    const getDep = async () => {
+      const { data } = await workforceApi.getDepTree();
+      depList.value = data.departmentList;
+    };
+    getDep();
+
+    const changeDept = async () => {
+      const resp = await workforceApi.getPostByDepId(
+        searchFormState.value.depId
+      );
+      jobList.value = resp.data;
+      searchFormState.value.jobPostId = "";
+    };
+
+    const visible = ref(false);
+
+    // 当前规则
+    const currentRule = ref();
+    const handleEditClick = (row: any) => {
+      currentRule.value = row;
+      visible.value = true;
+    };
+
+    const handleDelClick = async (row: any) => {
+      const resp = await workforceApi.ruleRemove(row.code);
+      message.success("删除成功！");
+      refresh();
+    };
+
+    return () => (
+      <div class="workforceRuleComp flex">
+        <a-form
+          model={searchFormState.value}
+          ref={searchFormRef}
+          name="basic"
+          labelCol={{ style: { width: "100px" } }}
+          autocomplete="off"
+        >
+          <a-row class="row" gutter={[16, 16]}>
+            <a-col span="6">
+              <a-form-item label="部门" name="depId">
+                <a-tree-select
+                  allowClear
+                  dropdownMatchSelectWidth={300}
+                  style={{ width: "100%" }}
+                  fieldNames={{
+                    label: "name",
+                    value: "id",
+                    children: "subList",
+                  }}
+                  treeData={depList.value}
+                  v-model={[searchFormState.value.depId, "value"]}
+                  onChange={changeDept}
+                ></a-tree-select>
+              </a-form-item>
+            </a-col>
+
+            <a-col span="6">
+              <a-form-item label="岗位" name="jobPostId">
+                <a-select
+                  v-model={[searchFormState.value.jobPostId, "value"]}
+                  allowClear
+                  style="width: 100%"
+                >
+                  {jobList.value.map((item: any, index: number) => (
+                    <a-select-option key={item.id} value={item.id}>
+                      {item.name}
+                    </a-select-option>
+                  ))}
+                </a-select>
+              </a-form-item>
+            </a-col>
+
+            <a-col span="12" style={{ textAlign: "right" }}>
+              <a-space>
+                <a-button type="primary" onClick={refresh}>
+                  查询
+                </a-button>
+                <a-button
+                  onClick={() => {
+                    searchFormRef.value.resetFields();
+                    refresh();
+                  }}
+                >
+                  重置
+                </a-button>
+              </a-space>
+            </a-col>
+          </a-row>
+        </a-form>
+
+        <a-row class="row">
+          <a-col span="6">
+            <a-button
+              type="primary"
+              onClick={() => {
+                currentRule.value = {};
+                visible.value = true;
+              }}
+            >
+              添加排班规则
+            </a-button>
+          </a-col>
+        </a-row>
+
+        <a-table
+          dataSource={tableList.value}
+          columns={columns}
+          pagination={{
+            current: currPage.value,
+            pageSize: pageSize.value,
+            showTotal: (num: number) => `共${num}条`,
+            showQuickJumper: true,
+            showSizeChanger: true,
+            total: total.value,
+            onChange: handlePageChange,
+            "onUpdate:current": handlePageChange,
+            "onUpdate:pageSize": hanldePageSizeChange,
+          }}
+          loading={isLoading.value}
+          v-slots={{
+            bodyCell: ({ column, record }) => {
+              if (column.dataIndex === "operation") {
+                return (
+                  <a-space>
+                    <a-button
+                      size="small"
+                      type="link"
+                      onClick={() => handleEditClick(record)}
+                    >
+                      编辑
+                    </a-button>
+
+                    <a-popconfirm
+                      title="确认删除？"
+                      onConfirm={() => {
+                        handleDelClick(record);
+                      }}
+                    >
+                      <a-button size="small" type="link">
+                        删除
+                      </a-button>
+                    </a-popconfirm>
+                  </a-space>
+                );
+              }
+            },
+          }}
+        />
+
+        <Rule
+          ruleCode={currentRule.value?.code}
+          depList={depList.value}
+          v-model={[visible.value, "visible"]}
+          onRefresh={refresh}
+        />
+      </div>
+    );
+  },
+});

package/src/pageComponent/views/workforceManager/workforceRule/index.tsx

@@ -1,30 +1,33 @@
-import { defineComponent, ref } from "vue";
-import utils from "@/utils";
-
-import ClassManager from "./components/classManager";
-import WorkforceRule from "./components/workforceRule";
-
-const com = defineComponent({
-  setup() {
-    const activeKey = ref("1");
-
-    return () => (
-      <div class="workforceRule">
-        <a-tabs
-          v-model={[activeKey.value, "activeKey"]}
-          animated
-          destroyInactiveTabPane
-        >
-          <a-tab-pane key="1" tab="班制管理">
-            <ClassManager />
-          </a-tab-pane>
-          <a-tab-pane key="2" tab="排班规则">
-            <WorkforceRule />
-          </a-tab-pane>
-        </a-tabs>
-      </div>
-    );
-  },
-});
-
-export default utils.installComponent(com, "workforce-rule");
+import { defineComponent, ref } from "vue";
+import utils from "@/utils";
+
+import ClassManager from "./components/classManager";
+import WorkforceRuleComp from "./components/workforceRuleComp";
+
+import "./assets/index.less";
+
+const com = defineComponent({
+  setup() {
+    const activeKey = ref("1");
+
+    return () => (
+      <div class="workforceRule">
+        <a-tabs
+          v-model={[activeKey.value, "activeKey"]}
+          animated
+          destroyInactiveTabPane
+          style="height: 100%;"
+        >
+          <a-tab-pane key="1" tab="班制管理">
+            <ClassManager />
+          </a-tab-pane>
+          <a-tab-pane key="2" tab="排班规则">
+            <WorkforceRuleComp />
+          </a-tab-pane>
+        </a-tabs>
+      </div>
+    );
+  },
+});
+
+export default utils.installComponent(com, "workforce-rule");

package/src/styles/index.less

@@ -1,2 +1,2 @@
-@import url(../pageComponent/assets/styles/index.less);
+@import url(../pageComponent/assets/styles/index.less);
 @import url(../components/styles/index.less);

package/src/tpInit/utils.ts

@@ -1 +1 @@
-
+

package/src/types/gl.d.ts

@@ -1,25 +1,25 @@
-// declare module "cssnano";
-// declare module "acorn-jsx";
-import Store from "../pageComponent/config/install";
-import { instance } from "../pageComponent/api";
-
-declare namespace InlPc {}
-
-declare module "@vue/runtime-core" {
-  interface ComponentCustomProperties {
-    $store: typeof Store;
-    $axios: typeof instance;
-  }
-}
-
-declare global {
-  interface Window {
-    sid: string;
-    select: (opt: any) => void;
-    input: (opt: any) => void;
-    img: (opt: any) => void;
-    treeSelect: (opt: any) => void;
-  }
-}
-
-declare module "vue-clipboard3";
+// declare module "cssnano";
+// declare module "acorn-jsx";
+import Store from "../pageComponent/config/install";
+import { instance } from "../pageComponent/api";
+
+declare namespace InlPc {}
+
+declare module "@vue/runtime-core" {
+  interface ComponentCustomProperties {
+    $store: typeof Store;
+    $axios: typeof instance;
+  }
+}
+
+declare global {
+  interface Window {
+    sid: string;
+    select: (opt: any) => void;
+    input: (opt: any) => void;
+    img: (opt: any) => void;
+    treeSelect: (opt: any) => void;
+  }
+}
+
+declare module "vue-clipboard3";