From aa7714de9f7504292553b15ef6867bcadb996239 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 31 Mar 2025 18:49:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../static/js/system/child/addMajorForm.js | 75 ++++++
.../js/system/child/addProcessesForm.js | 118 +++++++++
.../resources/static/js/system/processes.js | 223 ++++++++++++++++++
.../pages/processes/child/addMajorForm.html | 42 ++++
.../processes/child/addProcessesForm.html | 50 ++++
.../static/pages/processes/processes.html | 70 ++++++
.../static/pages/user/updateMyself.html | 13 +-
7 files changed, 583 insertions(+), 8 deletions(-)
create mode 100644 src/main/resources/static/js/system/child/addMajorForm.js
create mode 100644 src/main/resources/static/js/system/child/addProcessesForm.js
create mode 100644 src/main/resources/static/js/system/processes.js
create mode 100644 src/main/resources/static/pages/processes/child/addMajorForm.html
create mode 100644 src/main/resources/static/pages/processes/child/addProcessesForm.html
create mode 100644 src/main/resources/static/pages/processes/processes.html
diff --git a/src/main/resources/static/js/system/child/addMajorForm.js b/src/main/resources/static/js/system/child/addMajorForm.js
new file mode 100644
index 0000000..421a44b
--- /dev/null
+++ b/src/main/resources/static/js/system/child/addMajorForm.js
@@ -0,0 +1,75 @@
+let form, layer, dtree, util, idParam, phoneParam;
+let arr = ['background', 'web', 'mobile', 'wx'];
+let background, web, mobile, wx;
+let data = [], appResList = [];
+function setParams(params) {
+ console.log(params)
+ layui.config({
+ base: "../../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径
+ }).extend({
+ dtree: 'dtree'
+ }).use(['form', 'layer', 'dtree', 'util'], function () {
+ layer = layui.layer;
+ form = layui.form;
+ util = layui.util;
+ dtree = layui.dtree;
+ var $ = layui.jquery;
+
+ form.on('submit(formData)', function (data) {
+ let Major = $('#Major').val();
+ if (!Major) {
+ return layer.alert("请输入专业名", {icon: 2})
+ }
+ saveData(data);
+ });
+ });
+
+}
+
+function saveData2() {
+ $('#formSubmit').trigger('click')
+}
+
+// 保存数据
+function saveData(data) {
+ let url = dataUrl + "/users/addTemp";
+ let params = data.field;
+ var arr_box = [];//固定复选框
+ $('#cbGuDing input[type=checkbox]:checked').each(function () {
+ arr_box.push($(this).val());
+ });
+ console.log(arr_box)
+ params.loginType = arr_box.join()
+ params.orgId = params.orgId_select_nodeId;
+
+ console.log(params)
+ params = {
+ encryptedData: encryptCBC(JSON.stringify(params))
+ }
+ ajaxRequest(url, "POST", params, true, function () {
+ $('.save').addClass("layui-btn-disabled").attr("disabled", true);
+ $('.cancel').addClass("layui-btn-disabled").attr("disabled", true);
+ }, function (result) {
+ if (result.code === 200) {
+ closePage(1);
+ parent.layer.msg(result.msg, {icon: 1});
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }, function (xhr) {
+ $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+ error(xhr)
+ });
+}
+
+// 关闭页面
+function closePage(type) {
+ let index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ if (type === 1) {
+ parent.reloadData()
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/system/child/addProcessesForm.js b/src/main/resources/static/js/system/child/addProcessesForm.js
new file mode 100644
index 0000000..28cc8b8
--- /dev/null
+++ b/src/main/resources/static/js/system/child/addProcessesForm.js
@@ -0,0 +1,118 @@
+let form, layer, dtree, util, idParam, phoneParam;
+let arr = ['background', 'web', 'mobile', 'wx'];
+let background, web, mobile, wx;
+let data = [], appResList = [];
+let majorList;
+
+function setParams(params) {
+ console.log(params)
+ idParam = JSON.parse(params).id;
+ layui.config({
+ base: "../../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径
+ }).extend({
+ dtree: 'dtree'
+ }).use(['form', 'layer', 'dtree', 'util'], function () {
+ layer = layui.layer;
+ form = layui.form;
+ util = layui.util;
+ dtree = layui.dtree;
+ var $ = layui.jquery;
+ majorList = getMajorSelected();
+
+ // form.render();
+ form.render("checkbox","select");//重新渲染页面checkbox控件
+ form.on('submit(formData)', function (data) {
+ data.field.id = $('#id').val();
+ console.log( data.field.orgId_select_nodeId);
+
+ let major = $('#major').val();
+ if (!major) {
+ return layer.alert("请选择专业名", {icon: 2})
+ }
+ let processes = $('#processes').val();
+ if (!processes) {
+ return layer.alert("请输入工序名", {icon: 2})
+ }
+ saveData(data);
+ });
+
+ });
+
+}
+
+/**
+ * 获取专业数据
+ */
+function getMajorSelected() {
+ let url = ctxPath + '/dicts/type';
+ let obj = {"type":"profession"}
+ let params = {
+ encryptedData: encryptCBC(JSON.stringify(obj))
+ }
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ if (result.code === 200) {
+ setSelectValue(result.data, 'major');
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
+ });
+
+}
+
+function setSelectValue(data){
+ let html = '';
+ $.each(data, function (index, item) {
+ html += '';
+ })
+ $('#major').empty().append(html);
+ layui.form.render();
+}
+
+function saveData2() {
+ $('#formSubmit').trigger('click')
+}
+
+// 保存数据
+function saveData(data) {
+ let loadingMsg = layer.msg('数据上传中,请稍候...', {icon: 16, scrollbar: false, time: 0});
+ let url = dataUrl + "/users/addTemp";
+ let params = data.field;
+ var arr_box = [];//固定复选框
+ $('#cbGuDing input[type=checkbox]:checked').each(function () {
+ arr_box.push($(this).val());
+ });
+ console.log(arr_box)
+ /* params={
+ encryptedData:encryptCBC(JSON.stringify(params))
+ }*/
+ ajaxRequest(url, "POST", params, true, function () {
+ $('.save').addClass("layui-btn-disabled").attr("disabled", true);
+ $('.cancel').addClass("layui-btn-disabled").attr("disabled", true);
+ }, function (result) {
+ layer.close(loadingMsg); // 关闭提示层
+ if (result.code === 200) {
+ closePage(1);
+ parent.layer.msg(result.msg, {icon: 1});
+ } else {
+ layer.alert(result.msg, {icon: 2})
+ $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+ }
+ }, function (xhr) {
+ layer.close(loadingMsg); // 关闭提示层
+ $('.save').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('.cancel').removeClass("layui-btn-disabled").attr("disabled", false);
+ error(xhr)
+ });
+}
+// 关闭页面
+function closePage(type) {
+ let index = parent.layer.getFrameIndex(window.name); //先得到当前 iframe层的索引
+ parent.layer.close(index); //再执行关闭
+ if (type === 1) {
+ parent.reloadData()
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/static/js/system/processes.js b/src/main/resources/static/js/system/processes.js
new file mode 100644
index 0000000..e84f94c
--- /dev/null
+++ b/src/main/resources/static/js/system/processes.js
@@ -0,0 +1,223 @@
+let form, layer, dtree, table, tableIns;
+let pageNum = 1, limitSize = 10; // 默认第一页，分页数量为10
+let orgData,selectOrgId="";
+
+layui.config({
+ base: "../../js/layui-v2.6.8/dtree/", //此处路径请自行处理, 可以使用绝对路径
+}).extend({
+ dtree: 'dtree'
+}).use(['form', 'layer', 'table','dtree', 'laydate'], function () {
+ form = layui.form;
+ layer = layui.layer;
+ table = layui.table;
+ dtree = layui.dtree;
+ layui.form.render();
+ pages(1, 10, 1);
+ form.on('switch(is-state)', function (obj) {
+ console.log(obj);
+ let url = dataUrl + "/users/updateEnableState";
+ let params = {
+ 'id': this.value,
+ 'state': obj.elem.checked ? 1 : 0
+ }
+ // params={
+ // encryptedData:encryptCBC(JSON.stringify(params))
+ // }
+ ajaxRequest(url, "POST", params, true, function () {}, function (result) {
+ console.log(result)
+ reloadData();
+ if (result.status === 200) {
+ parent.layer.msg(result.data, {icon: 1})
+ } else if (result.status === 204) {
+ parent.layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
+ });
+ });
+})
+
+function pages(pageNum, pageSize, typeNum) {
+ let params = getReqParams(pageNum, pageSize, typeNum);
+ let url = dataUrl + "/users/getList"
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ console.log(result);
+ if (result.code === 200) {
+ if (result.data) {
+ initTable(result.data, result.limit, result.curr)
+ laypages(result.count, result.curr, result.limit)
+ }
+ } else if (result.code === 500) {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ error(xhr)
+ });
+
+}
+
+function laypages(total, page, limit) {
+ layui.use(['laypage'], function () {
+ let laypage = layui.laypage;
+ laypage.render({
+ elem: 'voi-page',
+ count: total,
+ curr: page,
+ limit: limit,
+ limits: [10, 20, 50, 100, 200, 500],
+ layout: ['prev', 'page', 'next', 'skip', 'count', 'limit'],
+ groups: 5,
+ jump: function (obj, first) {
+ if (!first) {
+ pageNum = obj.curr, limitSize = obj.limit;
+ pages(obj.curr, obj.limit, null);
+ }
+ }
+ });
+ })
+}
+
+/*初始化表格*/
+function initTable(dataList, limit, page) {
+ let loadingMsg = layer.msg("数据加载中,请稍候...", {icon: 16, scrollbar: false, time: 0,});
+ tableIns = table.render({
+ elem: "#table_data",
+ height: "full-130",
+ data: dataList,
+ limit: limit,
+ cols: [
+ [
+ //表头
+ {title: "序号", width: 80, unresize: true, align: "center",
+ templet: function (d) {
+ return (page - 1) * limit + d.LAY_INDEX;
+ }
+ },
+ {field: "loginName", title: "专业", unresize: true, align: "center"},
+ {field: "username", title: "工序", unresize: true, align: "center"},
+ {field: "state", title: "状态", align: "center",templet: '#is-state'},
+ {field: "createTime", title: "创建时间", align: "center",templet: 'center'},
+ {title: "操作", unresize: true, width: 300, align: "center",
+ templet: function (d) {
+
+ let html = '';
+ // let updaetpwd="";
+ let del=""
+ let edit="";
+ html=edit+del;
+ if(d.delFlag==1){
+ return '';
+ }
+ return html;
+ }
+ },
+ ],
+ ],
+ done: function (res, curr, count) {
+ layer.close(loadingMsg);
+ table.resize("table_data");
+ count || this.elem.next(".layui-table-view").find(".layui-table-header").css("display", "inline-block");
+ count || this.elem.next(".layui-table-view").find(".layui-table-box").css("overflow", "auto");
+ },
+ });
+}
+
+
+// 获取参数
+function getReqParams(page, limit, type) {
+ let obj = {};
+ if (!type) {
+ obj = {
+ page: page + "",
+ limit: limit + "",
+ keyWord: $('#keyWord').val(),
+
+ };
+ } else {
+ obj = {
+ page: '1',
+ limit: '10',
+ keyWord: '',
+ };
+ }
+ console.log(obj)
+ obj={
+ encryptedData:encryptCBC(JSON.stringify(obj))
+ }
+ return obj;
+}
+
+// 查询/重置
+function query(type) {
+ pageNum = 1;
+ pages(1, limitSize);
+}
+
+
+//重置
+function reset() {
+ pages(1, limitSize, 1)
+}
+
+
+function reloadData() {
+ pages(pageNum, limitSize);
+}
+
+//新增专业
+/*function addMajor(id) {
+ let title = '新增专业'
+ let param = {
+ 'id': id
+ }
+ openIframe2("addMajorTemp", title, "child/addMajorForm.html", '800px', '200px', param);
+}*/
+//新增/修改工序
+function addProcesses(id) {
+ let title = '新增工序'
+ let param = {
+ 'id': id
+ }
+ openIframe2("addProcessesTemp", title, "child/addProcessesForm.html", '800px', '300px', param);
+}
+
+/*删除工序*/
+function delData(id) {
+ layer.confirm("确定删除吗？", {
+ move: false
+ }, function () {
+ let loadingMsg = layer.msg('数据删除中,请稍候...', {icon: 16, scrollbar: false, time: 0});
+ let url = dataUrl + "/users/delById";
+ let params = {
+ 'id': id
+ }
+ /* params={
+ encryptedData:encryptCBC(JSON.stringify(params))
+ }*/
+ ajaxRequest(url, "POST", params, true, function () {
+ }, function (result) {
+ layer.close(loadingMsg); // 关闭提示层
+ if (result.code === 200) {
+ parent.layer.msg(result.msg, {icon: 1})
+ query()
+ } else if (result.code === 500) {
+ layer.alert(result.msg, {icon: 2})
+ }
+ }, function (xhr) {
+ layer.close(loadingMsg); // 关闭提示层
+ error(xhr)
+ });
+ })
+}
+
+
+/*下拉选表单赋值*/
+function setSelectValue(list, selectName) {
+ let html = '';
+ $.each(list, function (index, item) {
+ html += '';
+ })
+ $('#' + selectName).empty().append(html);
+ layui.form.render();
+}
diff --git a/src/main/resources/static/pages/processes/child/addMajorForm.html b/src/main/resources/static/pages/processes/child/addMajorForm.html
new file mode 100644
index 0000000..40cb3ba
--- /dev/null
+++ b/src/main/resources/static/pages/processes/child/addMajorForm.html
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增专业
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/static/pages/processes/child/addProcessesForm.html b/src/main/resources/static/pages/processes/child/addProcessesForm.html
new file mode 100644
index 0000000..69f5fb4
--- /dev/null
+++ b/src/main/resources/static/pages/processes/child/addProcessesForm.html
@@ -0,0 +1,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 新增工序
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/static/pages/processes/processes.html b/src/main/resources/static/pages/processes/processes.html
new file mode 100644
index 0000000..f36db41
--- /dev/null
+++ b/src/main/resources/static/pages/processes/processes.html
@@ -0,0 +1,70 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 工序管理
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/resources/static/pages/user/updateMyself.html b/src/main/resources/static/pages/user/updateMyself.html
index b6466ae..010f06e 100644
--- a/src/main/resources/static/pages/user/updateMyself.html
+++ b/src/main/resources/static/pages/user/updateMyself.html
@@ -86,14 +86,11 @@
url : ctxPath + '/users/current',
async : false,
success : function(data) {
- $("#id").val(data.id);
- $("#username").val(data.username);
- $("#nickname").val(data.nickname);
- $("#phone").val(data.phone);
- $("#telephone").val(data.telephone);
- $("#email").val(data.email);
- $("#birthday").val(data.birthday);
- $("#sex").val(data.sex);
+ $("#id").val(data.data.id);
+ $("#username").val(data.data.loginName);
+ $("#nickname").val(data.data.username);
+ $("#phone").val(data.data.phone);
+ $("#sex").val(data.data.sex);
}
});
}