bug修改

src/views/finance/asset/index.vue

@@ -230,7 +230,7 @@
                     <div class="fx-field x-grid-col-12">
                         <div class="field-label">
                             <span class="field-required">*</span>
-                            <div class="field-name">资产日期</div>
+                            <div class="field-name">购买日期</div>
                         </div>
                         <div class="field-component">
                             <span :title="form.purchaseDate">{{ form.purchaseDate }}</span>
@@ -267,7 +267,6 @@
                     </div>
                     <div class="fx-field x-grid-col-12">
                         <div class="field-label">
-                            <span class="field-required">*</span>
                             <div class="field-name">归属地</div>
                         </div>
                         <div class="field-component">
@@ -551,7 +550,7 @@ export default {
 
         //打开领用，归还，报废弹窗
         handleReceive(val) {
-            this.reset();
+            this.resetReceiveform();
             if((val == '领用' || val == '报废') && this.assetInfo[0].assetState == 0){
                 this.receiveTitle = val;
                 this.openReceive = true;
@@ -674,7 +673,7 @@ export default {
         },
         cancelReceive() {
             this.openReceive = false;
-            this.reset();
+            this.resetReceiveform();
         },
         // 表单重置
         reset() {
@@ -693,6 +692,10 @@ export default {
                 fileIdList: undefined,
                 remarks: undefined,
             };
+            this.resetForm("form");
+        },
+          // 表单重置
+          resetReceiveform() {
             this.receiveform = {
                 assetInfoId: undefined,
                 employeeName: undefined,
@@ -704,7 +707,6 @@ export default {
                 returnReason: undefined,
                 retirementReason: undefined,
             };
-            this.resetForm("form");
             this.resetForm("receiveform");
         },
         /** 搜索按钮操作 */
@@ -736,6 +738,7 @@ export default {
         },
         /** 修改按钮操作 */
         handleUpdate(row) {
+            debugger
             this.reset();
             const id = row.id;
             getInfo(id).then(response => {

src/views/meeting/reserveList/index.vue

@@ -13,12 +13,12 @@
       <el-form-item label="会议开始" prop="startTime">
         <el-date-picker v-model="queryParams.startTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-          :default-time="['00:00', '23:59']" />
+          :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item label="会议结束" prop="endTime">
         <el-date-picker v-model="queryParams.endTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm"
           type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
-          :default-time="['00:00', '23:59']" />
+          :default-time="['00:00:00', '23:59:59']" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>

src/views/personnel/attendance/info/monthly.vue

@@ -15,6 +15,7 @@
       </el-form-item>
       <el-form-item label="日期" prop="attendanceMonth">
         <el-date-picker
+          value-format="yyyy-MM"
           v-model="queryParams.attendanceMonth"
           type="month"
           placeholder="选择月份">
@@ -94,6 +95,9 @@ export default {
     this.getListDept();
   },
   methods: {
+    handleAttendanceMonth(e){
+      console.log(e)
+    },
      //获取当前日期(年月)
      getNowDate() {
       const date = new Date()