修改几个小问题

src/views/module_base/client/ClientList.vue

@@ -9,13 +9,13 @@
               <a-input placeholder="请输入单位名称" v-model="queryParam.clientName"></a-input>
             </a-form-item>
           </a-col>
-          <a-col :xl="6" :lg="7" :md="8" :sm="24">
-            <a-form-item label="单位地址">
-              <a-input placeholder="请输入单位地址" v-model="queryParam.clientAddress"></a-input>
-            </a-form-item>
-          </a-col>
           <template v-if="toggleSearchStatus">
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
+              <a-form-item label="单位地址">
+                <a-input placeholder="请输入单位地址" v-model="queryParam.clientAddress"></a-input>
+              </a-form-item>
+            </a-col>
+            <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="联系人姓名">
                 <a-input placeholder="请输入联系人姓名" v-model="queryParam.clientPerson"></a-input>
               </a-form-item>

src/views/module_tpm/equipment/modules/EquipmentForm.vue

@@ -81,12 +81,12 @@
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="出厂日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productDate">
-              <j-date placeholder="请选择出厂日期"  v-model="model.productDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+              <j-date placeholder="请选择出厂日期"  v-model="model.productDate" :show-time="true" date-format="YYYY-MM-DD" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
             <a-form-model-item label="启用日期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="activeDate">
-              <j-date placeholder="请选择启用日期"  v-model="model.activeDate" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+              <j-date placeholder="请选择启用日期"  v-model="model.activeDate" :show-time="true" date-format="YYYY-MM-DD" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
@@ -121,6 +121,7 @@
 <script>
 
   import { httpAction, getAction } from '@/api/manage'
+  import { duplicateCheck } from '@/api/api'
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
@@ -156,6 +157,9 @@
           equipmentname: [
             { required: true, message: '请输入设备名称!'},
           ],
+          equipmentcode: [
+            { validator: this.validateTemplateCode}
+          ],
           equipmenttreeid: [
             { required: true, message: '请选择设备分类!'},
           ],
@@ -189,6 +193,22 @@
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
+      validateTemplateCode(rule, value, callback){
+        var params = {
+          tableName: "tpm_equipment",
+          fieldName: "equipmentcode",
+          fieldVal: value,
+          dataId: this.model.id
+        }
+        duplicateCheck(params).then((res)=>{
+          if(res.success){
+            callback();
+          }else{
+            callback("设备编号已存在，请重新输入");
+          }
+        })
+
+      },
       add () {
         this.edit(this.modelDefault);
       },

src/views/system/modules/UserModal.vue

@@ -168,11 +168,16 @@
           confirmpassword: [{required: true, message: '请重新输入登录密码!',},
             { validator: this.compareToFirstPassword,}],
           realname:[{ required: true, message: '请输入用户名称!' }],
-          phone: [{required: true, message: '请输入手机号!'}, {validator: this.validatePhone}],
+          phone: [
+            // {required: true, message: '请输入手机号!'}, 
+            {validator: this.validatePhone}
+          ],
           email: [{validator: this.validateEmail}],
           roles:{},
-          workNo:[ { required: true, message: '请输入工号' },
-            { validator: this.validateWorkNo }],
+          workNo:[ 
+            { required: true, message: '请输入工号' },
+            { validator: this.validateWorkNo }
+            ],
           telephone: [{ pattern: /^0\d{2,3}-[1-9]\d{6,7}$/, message: '请输入正确的座机号码' },]
         },
         departIdShow:false,