From 8abc9481eafeb715b39a4f4f8d6f628a642e6b53 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 19 三月 2025 17:38:18 +0800
Subject: [PATCH] 优化AGV和输送线、产线对接逻辑

---
 项目代码/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue |   70 ++++++++++++++---------------------
 1 files changed, 28 insertions(+), 42 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue"
index 35ba0a0..a75daa5 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSClient/src/views/system/UserInfo.vue"
@@ -1,6 +1,6 @@
 <template>
   <VolBox :width="500" :height="270" v-model="modifyOptions.model" title="淇敼瀵嗙爜">
-    <div style="padding:10px;20px;">
+    <div style="padding:20px;">
       <VolForm ref="pwd" :formRules="modifyOptions.data" :formFields="modifyOptions.fields"></VolForm>
     </div>
     <template #footer>
@@ -21,7 +21,7 @@
             <span>娉ㄥ唽鏃ユ湡锛歿{ userInfo.createDate }}</span>
           </p>
           <p>
-            <el-button type="error" @click="modifyPwd" size="small" long>淇敼瀵嗙爜</el-button>
+            <el-button type="error" @click="modifyPwd" size="small" icon="md-lock" long>淇敼瀵嗙爜</el-button>
             <!-- <el-button
               style="padding: 3px 16px"
               @click="modifyImg"
@@ -37,14 +37,15 @@
     <div class="right">
       <vol-form ref="form" :load-key="true" :width="500" :formRules="editFormOptions" :formFields="editFormFields">
         <div class="footer">
-          <el-button
+          <!-- <el-button
             style="margin-top: 2px"
             type="primary"
             size="small"
+            icon="md-checkmark-circle"
             long
             @click="modifyInfo"
             >淇濆瓨</el-button
-          >
+          > -->
         </div>
       </vol-form>
     </div>
@@ -80,7 +81,7 @@
         return this.$message.error("涓ゆ瀵嗙爜涓嶄竴鑷�");
       }
       let url =
-        "/api/Sys_user/modifyPwd?oldPwd=" +
+        "/api/User/modifyPwd?oldPwd=" +
         this.modifyOptions.fields.oldPwd +
         "&newPwd=" +
         this.modifyOptions.fields.newPwd;
@@ -94,33 +95,11 @@
       });
     },
     modifyInfo() {
-      // this.$message.info("淇敼涓汉淇℃伅");
-      let url =
-        "/api/Sys_user/UpdateInfo?roleName=" +
-        this.editFormFields.roleName +
-        "&userName=" +
-        this.editFormFields.userName +
-        "&userTrueName=" +
-        this.editFormFields.userTrueName +
-        "&address=" +
-        this.editFormFields.address +
-        "&gender=" +
-        this.editFormFields.gender +
-        "&remark=" +
-        this.editFormFields.remark +
-      this.http.post(url, {}, true).then((x) => {
-        if (!x.status) {
-          return this.$message.error(x.message);
-        }
-        // this.modifyOptions.model = false;
-        // this.$Message.success(x.message);
-        // this.$refs.pwd.reset();
-      });
-      console.log(this.editFormFields.roleName)
+      this.$message.info("淇敼涓汉淇℃伅");
     },
   },
   created() {
-    this.http.post("/api/Sys_user/getCurrentUserInfo", {}, true).then((x) => {
+    this.http.post("/api/User/getCurrentUserInfo", {}, true).then((x) => {
       if (!x.status) {
         return this.$message(x.message);
       }
@@ -143,7 +122,7 @@
       errorImg: 'this.src="' + require("@/assets/imgs/error-img.png") + '"',
       modifyOptions: {
         model: false,
-        fields: { oldPwd: "", newPwd: "", newPwd1: ""},
+        fields: { oldPwd: "", newPwd: "", newPwd1: "" },
         data: [
           [
             {
@@ -151,7 +130,6 @@
               required: true,
               title: "鏃у瘑鐮�",
               field: "oldPwd",
-              
             },
           ],
           [
@@ -181,7 +159,6 @@
         phoneNo: "",
       },
       editFormFields: {
-        user_Id:"",
         roleName: "",
         userName: "",
         userTrueName: "",
@@ -190,34 +167,40 @@
         remark: "",
       },
       editFormOptions: [
-      [
-          {
-            columnType: "int",
-            title: "ID",
-            field: "user_Id",
-          },
-        ],
         [
           {
             columnType: "string",
             title: "鐢ㄦ埛鍚�",
             field: "userName",
+            disabled: true,
           },
         ],
         [
           {
-            columnType: "string",
+            dataKey: "tree_roles",
             title: "瑙掕壊",
-            field: "roleName",
-            type: "text",
+            field: "role_Id",
+            disabled: true,
+            data: [],
+            type: "select",
           },
         ],
+        // [
+        //   {
+        //     columnType: "string",
+        //     title: "瑙掕壊",
+        //     field: "roleName",
+        //     disabled: true,
+        //     type: "text",
+        //   },
+        // ],
         [
           {
             columnType: "string",
             title: "鐪熷疄濮撳悕",
             field: "userTrueName",
             required: true,
+            disabled: true,
             type: "text",
           },
         ],
@@ -226,6 +209,7 @@
             columnType: "string",
             title: "鍦板潃",
             field: "address",
+            disabled: true,
             type: "text",
           },
         ],
@@ -234,6 +218,7 @@
             dataKey: "gender",
             title: "鎬у埆",
             field: "gender",
+            disabled: true,
             data: [],
             type: "select",
           },
@@ -243,6 +228,7 @@
             columnType: "string",
             title: "澶囨敞",
             field: "remark",
+            disabled: true,
             colSize: 12,
             type: "textarea",
           },

--
Gitblit v1.9.3