Merge remote-tracking branch 'origin/master'

罗广辉

17 hours ago 5f694550ed7bf0f6147c66feaa4406034ae62e54

 applications/drone-command/src/views/basicManage/deviceStock/FormDiaLog.vue

@@ -45,6 +45,14 @@
               <div class="val">{{ formData.belongDeptName }}</div>
            </el-col>
            <el-col :span="12">
               <div class="label">开始使用日期</div>
               <div class="val">{{ formData.useDate }}</div>
            </el-col>
            <el-col :span="12">
               <div class="label">使用年限</div>
               <div class="val">{{ formData.serviceLife }}</div>
            </el-col>
            <el-col :span="12">
               <div class="label">负责人</div>
               <div class="val">{{ formData.charger }}</div>
            </el-col>
@@ -80,7 +88,7 @@
         </div>
      </div>

      <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="100px">
      <el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" label-width="120px">
         <el-row>
            <el-col :span="12">
               <el-form-item label="设备名称" prop="deviceName">
@@ -150,19 +158,30 @@
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="使用日期" prop="serviceLife">
               <el-form-item label="开始使用日期" prop="useDate">
                  <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
                     v-model="formData.serviceLife"
                     v-model="formData.useDate"
                     type="date"
                     placeholder="选择日期"
                     value-format="YYYY-MM-DD HH:mm:ss"
                     value-format="YYYY-MM-DD"
                     clearable
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12">
               <el-form-item label="使用年限" prop="useDate">
                  <el-input type="number" class="command-input" v-model="formData.useDate" maxlength="50" placeholder="请输入" clearable />
               <el-form-item label="使用年限" prop="serviceLife">
                   <el-input-number
                     class="command-input"
                     v-model="formData.serviceLife"
                     :min="0"
                     :max="100"
                     :precision="0"
                     :step="1"
                     step-strictly
                     :controls="false"
                     placeholder="请输入"
                     @keydown="e => ['.', 'e', 'E', '+', '-'].includes(e.key) && e.preventDefault()"
                  />
               </el-form-item>
            </el-col>
            <el-col :span="12">
@@ -262,8 +281,8 @@
   belongDept: fieldRules(true),
   contactPhone: contactPhoneRules(true, 50),
   charger: fieldRules(true),
   serviceLife: fieldRules(true, 50),
   useDate: fieldRules(true, 50),
   serviceLife: fieldRules(true),
   useDate: fieldRules(true),
}

const userList = ref([])