diff --git a/src/api/inout/orderDetailCode.js b/src/api/inout/orderDetailCode.js
index 05640171..21baba7e 100644
--- a/src/api/inout/orderDetailCode.js
+++ b/src/api/inout/orderDetailCode.js
@@ -75,7 +75,7 @@ export function updateCodeProduct(query) {
 }
 
 
-//业务明细添加术士套包
+//业务明细添加术式套包
 export function addWarlockBagProduct(query) {
   return axios({
     url: "/udiwms/inout/order/addWarlockBagProduct",
diff --git a/src/views/basic/destiny/warlockBag.vue b/src/views/basic/destiny/warlockBag.vue
index a614074b..29b2ae89 100644
--- a/src/views/basic/destiny/warlockBag.vue
+++ b/src/views/basic/destiny/warlockBag.vue
@@ -206,8 +206,8 @@ export default {
       codeArray: [],
       editQuery: {},
       formMap: {
-        "add": "新增术士套包",
-        "edit": "编辑术士套包"
+        "add": "新增术式套包",
+        "edit": "编辑术式套包"
       },
       statusMap: {
         1: "草稿",
diff --git a/src/views/basic/destiny/warlockBagModel.vue b/src/views/basic/destiny/warlockBagModel.vue
index 67518400..55e479f7 100644
--- a/src/views/basic/destiny/warlockBagModel.vue
+++ b/src/views/basic/destiny/warlockBagModel.vue
@@ -264,7 +264,7 @@ export default {
     },
     combine(){
       if (this.currentRow == null) {
-        this.$message.error('未选择术士套包');
+        this.$message.error('未选择术式套包');
         return;
       }
 
diff --git a/src/views/inout/PanelCreateOrderBizDetail.vue b/src/views/inout/PanelCreateOrderBizDetail.vue
index 11e16bbc..8e768705 100644
--- a/src/views/inout/PanelCreateOrderBizDetail.vue
+++ b/src/views/inout/PanelCreateOrderBizDetail.vue
@@ -8,7 +8,7 @@
             ref="mainTable"
             @click.native.stop="selectWarlockBagFunction()"
             :loading="loading"
-          >术士套包录入
+          >术式套包录入
           </el-button>
           <el-button
             type="primary"
@@ -122,7 +122,7 @@
     </el-table>
 
     <el-dialog
-      title="业务详情-术士套包录入"
+      title="业务详情-术式套包录入"
       :visible.sync="selectWarlockBagVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
diff --git a/src/views/inout/receive/DialogNewReceive.vue b/src/views/inout/receive/DialogNewReceive.vue
index ba412dcc..a8560895 100644
--- a/src/views/inout/receive/DialogNewReceive.vue
+++ b/src/views/inout/receive/DialogNewReceive.vue
@@ -111,7 +111,7 @@
               type="primary"
               @click.native.stop="selectWarlockBagFunction()"
               :loading="loading"
-            >术士套包录入
+            >术式套包录入
             </el-button>
             <el-button
               type="primary"
@@ -169,7 +169,7 @@
 
 
     <el-dialog
-      title="业务详情-术士套包录入"
+      title="业务详情-术式套包录入"
       :visible.sync="selectWarlockBagVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 2647e5b2..28419d3b 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -31,26 +31,45 @@
             </i>
           </el-input>
         </el-form-item>
+
         <el-form-item prop="password" class="item">
           <el-input
+            prefix-icon="el-icon-lock"
+            v-model="pwdCover"
+            type="text"
+            name="pwd"
+            id="pwd"
             placeholder="密码"
-            name="password"
-            :type="isShowPwd ? 'text' : 'password'"
+            autocomplete="off"
+            @input="setPassword"
             @keyup.enter.native="handleLogin"
-            v-model="loginForm.password"
-            autocomplete="on"
           >
-            <i slot="prefix" class="el-input__icon">
-              <icon-svg icon-class="pwd"/>
-            </i>
             <i
               slot="suffix"
-              class="el-input__icon"
-              @click="isShowPwd = !isShowPwd"
-            >
-              <icon-svg icon-class="eye"/>
-            </i>
+              class="el-icon-view"
+              style="margin-top: 10px; margin-right: 10px; font-size: 18px"
+              @click="hidePassword"
+            ></i>
           </el-input>
+<!--          <el-input-->
+<!--            placeholder="密码"-->
+<!--            name="password"-->
+<!--            :type="isShowPwd ? 'text' : 'password'"-->
+<!--            @keyup.enter.native="handleLogin"-->
+<!--            v-model="loginForm.password"-->
+<!--            autocomplete="on"-->
+<!--          >-->
+<!--            <i slot="prefix" class="el-input__icon">-->
+<!--              <icon-svg icon-class="pwd"/>-->
+<!--            </i>-->
+<!--            <i-->
+<!--              slot="suffix"-->
+<!--              class="el-input__icon"-->
+<!--              @click="isShowPwd = !isShowPwd"-->
+<!--            >-->
+<!--              <icon-svg icon-class="eye"/>-->
+<!--            </i>-->
+<!--          </el-input>-->
         </el-form-item>
         <el-form-item
           prop="verificationCode"
@@ -134,6 +153,8 @@ export default {
       }
     };
     return {
+      password:"",
+      pwdCover:"",
       ruleForm: {
         userName: "",
         pwd: "",
@@ -155,6 +176,7 @@ export default {
         pwd: [{validator: validatePwd, trigger: "blur"}],
       },
       isShowPwd: false, // 是否显示密码
+      isShowPassword: false, // 是否显示密码
       loading: false, // 登录loading
       showDialog: false, // 显示dialog
       redirect: null, // 回调地址
@@ -170,6 +192,60 @@ export default {
     };
   },
   methods: {
+    setPassword(val) {
+      if (this.isShowPassword) {
+        this.password = val;
+      } else {
+        // let reg = /[0-9a-zA-Z]/g; // 只允许输入字母和数字
+        let nDot = /[^●]/g; // 非圆点字符
+        let index = -1; // 新输入的字符位置
+        let lastChar = void 0; // 新输入的字符
+        let realArr = this.password.split(""); // 真实密码数组
+        let coverArr = val.split(""); // 文本框显示密码数组
+        let coverLen = val.length; // 文本框字符串长度
+        let realLen = this.password.length; // 真实密码长度
+        // 找到新输入的字符及位置
+        coverArr.forEach((el, idx) => {
+          if (nDot.test(el)) {
+            index = idx;
+            lastChar = el;
+          }
+        });
+        // 判断输入的字符是否符合规范，不符合的话去掉该字符
+        // if (lastChar && !reg.test(lastChar)) {
+        //   coverArr.splice(index, 1);
+        //   this.pwdCover = coverArr.join("");
+        //   return;
+        // }
+        if (realLen < coverLen) {
+          // 新增字符
+          realArr.splice(index, 0, lastChar);
+        } else if (coverLen <= realLen && index !== -1) {
+          // 替换字符（选取一个或多个字符直接替换）
+          realArr.splice(index, realLen - (coverLen - 1), lastChar);
+        } else {
+          // 删除字符，因为 val 全是 ● ，没有办法匹配，不知道是从末尾还是中间删除的字符，删除了几个，不好对 password 处理，所以可以通过光标的位置和 val 的长度来判断
+          let pos = document.getElementById("pwd").selectionEnd; // 获取光标位置
+          realArr.splice(pos, realLen - coverLen);
+        }
+        // 将 pwdCover 替换成 ●
+        this.pwdCover = val.replace(/\S/g, "●");
+        this.password = realArr.join("");
+      }
+    },
+// 点击右侧小眼睛控制显示隐藏
+    hidePassword() {
+      if (!this.isShowPassword) {
+        // console.log("显示");
+        this.isShowPassword = true;
+        this.pwdCover = this.password;
+      } else {
+        // console.log("隐藏");
+        this.isShowPassword = false;
+        this.pwdCover = this.pwdCover.replace(/\S/g, "●");
+      }
+    },
+
     verifyAlert(text) {
       if (text === "success") {
         this.loginForm.verificationCode = true;
@@ -232,6 +308,7 @@ export default {
       };
     },
     handleLogin() {
+      this.loginForm.password = this.password
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
           if (this.loginForm.verificationCode) {
diff --git a/src/views/purchase/purApply/purApplyEditDiaolog.vue b/src/views/purchase/purApply/purApplyEditDiaolog.vue
index 7ee8e69c..4d5bda64 100644
--- a/src/views/purchase/purApply/purApplyEditDiaolog.vue
+++ b/src/views/purchase/purApply/purApplyEditDiaolog.vue
@@ -100,7 +100,7 @@
                 type="primary"
                 @click.native.stop="selectWarlockBagFunction()"
                 :loading="loading"
-              >术士套包录入
+              >术式套包录入
               </el-button>
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
               </el-button>
@@ -148,7 +148,7 @@
 
 
     <el-dialog
-      title="术士套包录入"
+      title="术式套包录入"
       :visible.sync="selectWarlockBagVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index 429c0e49..9ceb4193 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -131,7 +131,7 @@
                 type="primary"
                 @click.native.stop="selectWarlockBagFunction()"
                 :loading="loading"
-              >术士套包录入
+              >术式套包录入
               </el-button>
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入
               </el-button>
@@ -192,7 +192,7 @@
     </el-form>
 
     <el-dialog
-      title="术士套包录入"
+      title="术式套包录入"
       :visible.sync="selectWarlockBagVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
diff --git a/src/views/purchase/purPlan/purPlanEditDialog.vue b/src/views/purchase/purPlan/purPlanEditDialog.vue
index 20fbefa8..7ad4f88b 100644
--- a/src/views/purchase/purPlan/purPlanEditDialog.vue
+++ b/src/views/purchase/purPlan/purPlanEditDialog.vue
@@ -98,7 +98,7 @@
                 type="primary"
                 @click.native.stop="selectWarlockBagFunction()"
                 :loading="loading"
-              >术士套包录入
+              >术式套包录入
               </el-button>
               <el-button type="primary" @click.native.stop="selectProductFunction()" :loading="loading">产品录入</el-button>
 <!--              <el-button type="primary" :loading="loading" @click.native.stop="selectApply()">选入申购单</el-button>-->
@@ -142,7 +142,7 @@
     </el-form>
 
     <el-dialog
-      title="术士套包录入"
+      title="术式套包录入"
       :visible.sync="selectWarlockBagVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"