소스 검색

硬件查询修改

pm 1 년 전
부모
커밋
1be0549c76
3개의 변경된 파일36개의 추가작업 그리고 8개의 파일을 삭제
  1. 12 4
      src/views/mes/hw/information/index.vue
  2. 24 2
      src/views/mes/job/jobm/NewOperations.vue
  3. 0 2
      src/views/mes/sop/sopm/NewSop.vue

+ 12 - 4
src/views/mes/hw/information/index.vue

@@ -434,7 +434,6 @@ export default {
         status:'',
         hardwareTypeName:'',
         hardwareSpec:'',
-
         startTime:'',
         endTime:'',
         workshopName:'',
@@ -517,8 +516,8 @@ export default {
     // 格式化日期查询数据
     formatDate(date) {
       if (date && date instanceof Date && !isNaN(date)) {
-        // 使用 UTC 时间来避免时区问题
-        return `${date.getUTCFullYear()}-${String(date.getUTCMonth() + 1).padStart(2, '0')}-${String(date.getUTCDate()).padStart(2, '0')}`;
+        // 使用本地时间
+        return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')}`;
       }
       return null;
     },
@@ -594,8 +593,11 @@ export default {
         hardwareTypeName:'',
         hardwareSpec:'',
         createTime:'',
-        workshopName:''
+        workshopName:'',
+        workshopId: '',
+        workshopCode: null,
       };
+
       this.autoGenFlag = false;
       this.resetForm("form");
     },
@@ -606,6 +608,12 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.workshopCode=""
+      this.queryParams.workshopName=""
+      this.queryParams.workshopId=""
+      this.createTime="";//之所以不把这个值放到queryParams是因为会被携带到参数里create Time[0]这样的内容携带进去
+      this.queryParams.startTime=""
+      this.queryParams.endTime=""
       this.resetForm("queryForm");
       this.handleQuery();
     },

+ 24 - 2
src/views/mes/job/jobm/NewOperations.vue

@@ -66,7 +66,7 @@
                       </el-select>
                     </el-form-item>
                     <el-form-item label="作业内容" prop="workContent">
-                     <el-input type="textarea" v-model="form.workContent" :row="3"></el-input>
+                     <el-input type="textarea" v-model="form.workContent" :rows="4"></el-input>
                     </el-form-item>
                     <el-form-item label="" prop="">
                       <el-button style="float: right;height: 30px;line-height: 10px" type="primary" @click="nextStep('second')">下一步</el-button>
@@ -96,8 +96,10 @@
                         v-model="form.spoint"
                         placeholder="已选隔离点"
                         clearable
-                        style="width: 100%"
+                        class="selects"
+                        style="width: 100%;"
                         multiple
+                        collapse-tags
                       >
                         <el-option
                           v-for="dict in this.selectPoint"
@@ -409,4 +411,24 @@ export default {
   height: 280px;
 }
 //右侧卡片样式结束
+//隔离点多选框样式
+.selects {
+  .el-input.el-input--medium.el-input--suffix { // 调整箭头符号块的宽度
+    width: 175px !important;
+  }
+  .el-input.el-input--medium.el-input--suffix {
+    .el-input__inner {                          // 调整输入框的宽高
+      height: 36px !important;
+      width: 220px !important;
+    }
+    .el-input__suffix-inner {                   // 调整箭头符号的位置
+      position: absolute;
+      right: -45px;
+    }
+  }
+  .el-select__tags {                            // 调整输入框里面的多选不换行
+    flex-wrap: nowrap !important;
+  }
+}
+//隔离点多选框样式结束
 </style>

+ 0 - 2
src/views/mes/sop/sopm/NewSop.vue

@@ -270,11 +270,9 @@ export default {
     },
     preStep() {
       this.activeName = "first";
-
     },
     nextStep() {
       this.activeName = "second";
-
       console.log("我点击了下一步");
     },
   },