user

.env.development

@@ -7,11 +7,11 @@ VUE_APP_TITLE = EasyDo智能生产运营平台
 # 接口地址
 VUE_APP_ZEROAPI_BASEURL = http://www.qdeasydo.com
 # VUE_APP_MES_BASEURL = http://www.qdeasydo.com/mes
-VUE_APP_MES_BASEURL = http://192.168.101.93:8200
-# VUE_APP_MES_BASEURL = http://192.168.101.93:8080  #go
+# VUE_APP_MES_BASEURL = http://192.168.101.93:8200
+VUE_APP_MES_BASEURL = http://192.168.101.93:8080
 
 # 本地端口
-VUE_APP_PORT = 4400
+VUE_APP_PORT = 1200
 
 # 是否开启代理
 VUE_APP_PROXY = true

src/utils/print.js

@@ -35,13 +35,11 @@ Print.prototype = {
 	},
 
 	getStyle: function() {
-		var str = "",
-			styles = document.querySelectorAll('style,link');
+		var str = "", styles = document.querySelectorAll('style,link');
 		for (var i = 0; i < styles.length; i++) {
 			str += styles[i].outerHTML;
 		}
-		str += "<style>" + (this.options.noPrint ? this.options.noPrint : '.no-print') +
-			"{display:none;}</style>";
+		str += "<style>" + (this.options.noPrint ? this.options.noPrint : '.no-print') + "{display:none;}</style>";
 		str += "<style>html,body{background-color:#fff;}</style>";
 		return str;
 	},
@@ -90,8 +88,7 @@ Print.prototype = {
 	},
 
 	writeIframe: function(content) {
-		var w, doc, iframe = document.createElement('iframe'),
-			f = document.body.appendChild(iframe);
+		var w, doc, iframe = document.createElement('iframe'), f = document.body.appendChild(iframe);
 		iframe.id = "myIframe";
 		//iframe.style = "position:absolute;width:0;height:0;top:-10px;left:-10px;";
 		iframe.setAttribute('style', 'position:absolute;width:0;height:0;top:-10px;left:-10px;');
@@ -134,4 +131,4 @@ Print.prototype = {
 		}
 };
 
-export default Print
+export default Print

src/views/sales/order/detail.vue

@@ -11,7 +11,7 @@
                         </el-col>
                         <el-col :md="8" :xs="24">
                             <el-form-item label="单据日期" prop="orderDate">
-                                <el-date-picker v-model="form.orderDate" :clearable="false" value-format="YYYY-MM-DD" :default-time="new Date()" placeholder="请选择单据日期"></el-date-picker>
+                                <el-date-picker v-model="form.orderDate" :clearable="false" value-format="YYYY-MM-DD" placeholder="请选择单据日期"></el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :md="8" :xs="24">
@@ -26,7 +26,7 @@
                         </el-col>
                         <el-col :md="8" :xs="24">
                             <el-form-item label="预计交期" prop="planReceiveDate">
-                                <el-date-picker v-model="form.planReceiveDate" :clearable="false" value-format="YYYY-MM-DD" :default-time="new Date()" placeholder="请选择预计交期"></el-date-picker>
+                                <el-date-picker v-model="form.planReceiveDate" :clearable="false" value-format="YYYY-MM-DD" placeholder="请选择预计交期"></el-date-picker>
                             </el-form-item>
                         </el-col>
                         <el-col :md="8" :xs="24">

src/views/system/dept/detail.vue

@@ -2,7 +2,7 @@
     <el-dialog v-model="visible" :title="titleMap[mode]" width="480" :close-on-click-modal="false" @closed="$emit('closed')">
         <el-form ref="formRef" :model="form" :rules="rules" label-width="120">
             <el-form-item label="上级部门" prop="pid">
-				<el-tree-select v-model="form.pid" :data="deptTree" :props="treeProps" node-key="id" :default-expanded-keys="expandedKeys" check-strictly placeholder="上级部门"></el-tree-select>
+				<el-tree-select v-model="form.pid" :node-key="treeProps.value" :data="deptTree" :props="treeProps" :default-expanded-keys="expandedKeys" check-strictly placeholder="上级部门"></el-tree-select>
 			</el-form-item>
 			<el-form-item label="部门名称" prop="name">
 				<el-input v-model="form.name" placeholder="请输入部门名称"></el-input>

src/views/system/menu/detail.vue

@@ -4,7 +4,7 @@
     <el-scrollbar>
         <el-form ref="formRef" :model="form" :rules="rules" label-width="120">
             <el-form-item label="上级菜单" required>
-				<el-tree-select v-model="form.pid" :data="treeSelect" :props="treeProps" node-key="id" :default-expanded-keys="expandedKeys" check-strictly placeholder="智能生产运管平台"></el-tree-select>
+				<el-tree-select v-model="form.pid" :node-key="treeProps.value" :data="treeSelect" :props="treeProps" :default-expanded-keys="expandedKeys" check-strictly placeholder="智能生产运管平台"></el-tree-select>
             </el-form-item>
             <el-form-item prop="title">
                 <template #label>

src/views/system/user/detail.vue

@@ -28,7 +28,7 @@
                 </el-radio-group>
             </el-form-item>
             <el-form-item label="所属部门" prop="deptId">
-				<el-tree-select v-model="form.deptId" :data="deptTree" :props="treeProps" node-key="id" :default-expanded-keys="expandedKeys" check-strictly placeholder="请选择所属部门"></el-tree-select>
+				<el-tree-select v-model="form.deptId" :node-key="treeProps.value" :data="deptTree" :props="treeProps" :default-expanded-keys="expandedKeys" check-strictly placeholder="请选择所属部门"></el-tree-select>
 			</el-form-item>
         </el-form>
 
@@ -43,6 +43,7 @@
 import XEUtils from "xe-utils";
 
 import API from "@/api";
+import TOOL from "@/utils/tool";
 import { verifyIdCard } from "@/utils/verificate";
 const $emit = defineEmits(["success", "closed"]);
 const props = defineProps({
@@ -81,9 +82,7 @@ const rules = reactive({
     roleList: [{ required: true, message: "请选择用户角色" }],
     username: [{ required: true, message: "请输入用户名" }],
     nickName: [{ required: true, message: "请输入用户昵称" }],
-    "features.idcard": [
-        { validator: verifyIdCard }
-    ],
+    "features.idcard": [{ validator: verifyIdCard }],
     phone: [{ pattern: /^\d{11}$/, message: "请输入11位手机号码" }],
     deptId: [{ required: true, message: "请选择所属部门" }]
 });
@@ -116,6 +115,14 @@ const submit = () => {
                 ElMessage.success("操作成功");
                 visible.value = false;
                 $emit("success", mode.value);
+
+                if (data.id == TOOL.data.get("USER_INFO").id) {
+                    const userInfo = XEUtils.omit(form.value, "roleList", "features");
+                    XEUtils.set(userInfo, "dept", XEUtils.omit(XEUtils.get(XEUtils.findTree(props.deptTree, item => item.id == data.deptId), "item"), "children"));
+                    XEUtils.set(userInfo, "roleList", XEUtils.map(form.value.roleList, id => XEUtils.find(roles.value, item => item.id == id)));
+                    XEUtils.set(userInfo, "features", XEUtils.toJSONString(features));
+                    TOOL.data.set("USER_INFO", userInfo);
+                }
             }).catch(() => isSaving.value = false);
         } else {
             return false;

src/views/system/user/index.vue

@@ -85,6 +85,7 @@ const columns = reactive([
     { type: "seq", width: 60 },
     { type: "html", field: "username", title: "用户名", minWidth: 160, sortable: true },
     { type: "html", field: "nickName", title: "用户昵称", minWidth: 160, sortable: true },
+    { type: "html", field: "roleNames", title: "角色", minWidth: 160, sortable: true, formatter: ({ cellValue, row }) => cellValue || XEUtils.map(row.roleList, item => item.name).join() },
     { type: "html", field: "dept.name", title: "所属部门", minWidth: 160, sortable: true },
     { type: "html", field: "gender", title: "性别", minWidth: 100, sortable: true },
     { type: "html", field: "phone", title: "手机号", minWidth: 120, sortable: true },

src/views/userCenter/index.vue

@@ -21,12 +21,12 @@
                 <el-divider></el-divider>
                 <el-form-item>
                     <template #label><sc-iconify icon="roentgen:phone"></sc-iconify>手机号码</template>
-                    <vxe-text-ellipsis :title="$TOOL.data.get('USER_INFO').phone" :content="$TOOL.data.get('USER_INFO').phone"></vxe-text-ellipsis>
+                    <vxe-text-ellipsis :title="XEUtils.get($TOOL.data.get('USER_INFO'), 'phone', '暂未设置')" :content="XEUtils.get($TOOL.data.get('USER_INFO'), 'phone', '暂未设置')"></vxe-text-ellipsis>
                 </el-form-item>
                 <el-divider></el-divider>
                 <el-form-item>
                     <template #label><sc-iconify icon="mdi:email-outline"></sc-iconify>用户邮箱</template>
-                    <vxe-text-ellipsis :title="$TOOL.data.get('USER_INFO').email" :content="$TOOL.data.get('USER_INFO').email"></vxe-text-ellipsis>
+                    <vxe-text-ellipsis :title="XEUtils.get($TOOL.data.get('USER_INFO'), 'email', '暂未设置')" :content="XEUtils.get($TOOL.data.get('USER_INFO'), 'email', '暂未设置')"></vxe-text-ellipsis>
                 </el-form-item>
                 <el-divider></el-divider>
             </el-form>
@@ -75,7 +75,7 @@ const formRef = ref();
 const submit = () => {
     formRef.value.validate(valid => {
         if (valid) {
-            const data = XEUtils.omit(form.value, "dept", "password", "pwdResetTime", "roleList");
+            const data = XEUtils.omit(form.value, "dept", "roleList");
             XEUtils.set(data, "roleList", XEUtils.map(form.value.roleList, item => ({ id: item.id })));
 
             isSaving.value = true;