作业票和sop新增

src/views/mes/hw/information/index.vue

@@ -69,7 +69,7 @@
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
-          v-model="queryParams.createTime"
+          v-model="createTime"
           type="datetimerange"
           :picker-options="pickerOptions"
           range-separator="-"
@@ -85,12 +85,13 @@
           v-model="queryParams.workshopName"
           placeholder="请选择所属车间"
           clearable
+          @change="workShopChangequery"
         >
           <el-option
             v-for="dict in this.workshopOption"
             :key="dict.workshopId"
             :label="dict.workshopName"
-            :value="dict.workshopName"
+            :value="dict.workshopCode"
           />
         </el-select>
       </el-form-item>
@@ -424,6 +425,7 @@ export default {
       // 是否显示弹出层
       open: false,
       // 查询参数
+      createTime:'',
       queryParams: {
         current: 1,
         size: 10,
@@ -432,8 +434,12 @@ export default {
         status:'',
         hardwareTypeName:'',
         hardwareSpec:'',
-        createTime:'',
-        workshopName:''
+
+        startTime:'',
+        endTime:'',
+        workshopName:'',
+        workshopCode:'',
+        workshopId:'',
       },
       workshopOption:[
         {
@@ -508,9 +514,24 @@ export default {
     this.getHardwareTypeList()
   },
   methods: {
+    // 格式化日期查询数据
+    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 null;
+    },
     /** 查询设备维修单列表 */
+
     getList() {
       this.loading = true;
+      // 格式化日期并更新 queryParams
+      if (Array.isArray(this.createTime) && this.createTime.length === 2){
+        this.queryParams.startTime = this.formatDate(this.createTime[0]);
+        this.queryParams.endTime = this.formatDate(this.createTime[1]);
+      }
+
       listHardware(this.queryParams).then((response) => {
         this.repairList = response.data.records;
         this.total = response.data.total;
@@ -539,15 +560,26 @@ export default {
       this.form.hardwareTypeId=TypeId.key
       console.log(this.form.hardwareTypeId,'hardwareTypeId')
     },
-    // 车间下拉
+    // 车间下拉 --新增表单
     workShopChange(val){
       this.form.workshopCode=val
+
       const workshopId=this.workshopOption.find((item)=>{
         return item.workshopCode==val?item.workshopId:null;
       })
       this.form.workshopId=workshopId.workshopId
       this.form.workshopName=workshopId.workshopName
     },
+    workShopChangequery(val){
+      console.log(val,'查询下拉')
+      this.queryParams.workshopCode=val
+      const workshopId=this.workshopOption.find((item)=>{
+        return item.workshopCode==val?item.workshopId:null;
+      })
+      this.queryParams.workshopId=workshopId.workshopId
+      this.queryParams.workshopName=workshopId.workshopName
+    },
+
     // 取消按钮
     cancel() {
       this.open = false;

vue.config.js

@@ -35,6 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
+        // http://36.133.174.236:9090
         target: `http://192.168.1.127:9090`,
         changeOrigin: true,
         pathRewrite: {