Merge remote-tracking branch 'origin/master'

itdmWeb/src/views/module-iTDM/chuanganqi/modules/ItdmChuanganqiForm.vue

@@ -20,7 +20,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="youxiaoqi">
-              <a-input v-model="model.youxiaoqi" placeholder="请输入有效期"  ></a-input>
+              <j-date placeholder="请选择有效期"  v-model="model.youxiaoqi" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
+              <!-- <a-input v-model="model.youxiaoqi" placeholder="请输入有效期"  ></a-input> -->
             </a-form-model-item>
           </a-col>
         </a-row>

itdmWeb/src/views/module-iTDM/itdmDevice/modules/ItdmDeviceForm.vue

@@ -60,7 +60,8 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="计量有效期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="deviceLife">
-              <a-input v-model="model.deviceLife" placeholder="请输入计量有效期"  ></a-input>
+              <!-- <a-input v-model="model.deviceLife" placeholder="请输入计量有效期"  ></a-input> -->
+              <j-date placeholder="请选择计量有效期"  v-model="model.deviceLife" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" />
             </a-form-model-item>
           </a-col>
           <a-col :span="24">