1.更改密码页改为可查看密码；2委外维修-验收委外维修编辑将离厂日期/回厂日期/铅封号/质保日期改为必填

src/views/changpwd/changpwd.vue

@@ -11,10 +11,17 @@
         <el-input v-model="temp.oldpassword" type="password" auto-complete="off" />
       </el-form-item>
       <el-form-item label="新密码：" prop="password">
-        <el-input v-model="temp.password" placeholder="请输入8位以上密码,必须包含英文字母、数字和特殊字符" type="password" auto-complete="off" />
+        <el-input ref="password" v-model="temp.password" :type="passwordType" placeholder="请输入8位以上密码,必须包含英文字母、数字和特殊字符" :clearable="false" auto-complete="off"  />
+        <span class="show-pwd" @click="showPwd('1')">
+          <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
+        </span>
       </el-form-item>
       <el-form-item label="确认密码：" prop="password1">
-        <el-input v-model="temp.password1" placeholder="请输入8位以上密码,必须包含英文字母、数字和特殊字符" type="password" auto-complete="off" />
+        <el-input ref="password1" v-model="temp.password1" :type="passwordType1" placeholder="请输入8位以上密码,必须包含英文字母、数字和特殊字符" :clearable="false" auto-complete="off"  />
+        <span class="show-pwd" @click="showPwd('2')">
+          <svg-icon :icon-class="passwordType1 === 'password' ? 'eye' : 'eye-open'" />
+        </span>
+        <!-- <el-input v-model="temp.password1" placeholder="请输入8位以上密码,必须包含英文字母、数字和特殊字符" type="password" auto-complete="off" /> -->
       </el-form-item>
       <el-form-item>
         <el-button type="primary" @click.native.prevent="toAmend">确认修改</el-button>
@@ -64,6 +71,8 @@ export default {
         // }
       },
       temp: {},
+      passwordType: 'password',
+      passwordType1: 'password',
       rules: {
         oldpassword: [
           { required: true, validator: oldPass, trigger: 'blur' }
@@ -73,11 +82,32 @@ export default {
         ],
         password1: [
           { required: true, validator: validatePass2, trigger: 'blur' }
-        ]
+        ],
       }
     }
   },
   methods: {
+    showPwd(item) {
+      if(item == 1){
+        if (this.passwordType === 'password') {
+          this.passwordType = ''
+        } else {
+          this.passwordType = 'password'
+        }
+        this.$nextTick(() => {
+          this.$refs.password.focus()
+        })
+      }else{
+        if (this.passwordType1 === 'password') {
+          this.passwordType1 = ''
+        } else {
+          this.passwordType1= 'password'
+        }
+        this.$nextTick(() => {
+          this.$refs.password1.focus()
+        })
+      }
+    },
     toAmend() {
       console.log(111)
       this.$refs['temp'].validate(valid => {
@@ -136,4 +166,11 @@ export default {
     margin: 20px 0 0;
   }
 }
+.show-pwd {
+      position: absolute;
+      right: 40px;
+      font-size: 16px;
+      cursor: pointer;
+      user-select: none;
+    }
 </style>

src/views/maintenance/subcontractingMainten/tabPage/tab2.vue

@@ -788,7 +788,9 @@ export default {
       },
 
       rules: {
-        equipmentName: [{ required: true, message: '必填', trigger: 'blur' }]
+        equipmentName: [{ required: true, message: '必填', trigger: 'blur' }],
+        lcdate: [{ required: true, message: '必填', trigger: 'blur' }],
+        hcdate: [{ required: true, message: '必填', trigger: 'blur' }],
       },
       getPramPartApplyListBybig: {
         name:"getpartapplyListBybig",
@@ -1831,7 +1833,16 @@ export default {
 
         //牧场
         if(this.createTemp.applyType == 0){
-
+          for(let i=0;i<this.listAddCont.length;i++){
+            if(this.listAddCont[i].sealNumber == ''){
+              this.$message({ type: 'warning', message: '请检查铅封号是否未填写', duration: 2000 })
+              return false
+            }
+            if(this.listAddCont[i].warrantydate == ''){
+              this.$message({ type: 'warning', message: '请检查质保日期是否未填写', duration: 2000 })
+              return false
+            }
+          }