2025-01-08

维修工单增加待确认
1 year ago · 24c8e1b6c3
7 changed files with 50 additions and 24 deletions
--- a/src/views/modules/eam/eamWorkOrderForDefect.vue
+++ b/src/views/modules/eam/eamWorkOrderForDefect.vue
@ -49,6 +49,8 @@
      <el-form-item :label="'状态'">
        <el-select v-model="searchData.status" clearable style="width: 100px">
          <el-option label="未开工" value="未开工"></el-option>
+          <el-option label="已到达" value="已到达"></el-option>
+          <el-option label="待确认" value="待确认"></el-option>
          <el-option label="待审核" value="待审核"></el-option>
          <el-option label="已完工" value="已完工"></el-option>
          <el-option label="已取消" value="已取消"></el-option>
@ -61,7 +63,7 @@
          <el-option label="维修失败" value="维修失败"></el-option>
        </el-select>
      </el-form-item>
-      <el-form-item :label="'计划执行日期：'">
+      <el-form-item :label="'计划执行日期'">
        <el-date-picker
          style="width: 120px"
          v-model="searchData.startDate"
--- a/src/views/modules/qc/FAIResultEntry.vue
+++ b/src/views/modules/qc/FAIResultEntry.vue
@ -517,8 +517,8 @@
      </el-table>
      </div>
      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
      </el-footer>
    </el-dialog>
@ -998,6 +998,7 @@
    data () {
      return {
        loadFlag: false,
+        transferLoadFlag: false,
        inspectionNo: '',
        fileFlag: false,
        fileContentList: [],
@ -3418,6 +3419,7 @@
        this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
        this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
        this.saveInformationData.type = type
+        this.transferLoadFlag = true
        // this.saveInformationData.subDetailList = this.acquisitionList
        saveFAIDetailedRecord(this.saveInformationData).then(({data}) => {
          if (data && data.code === 0) {
@ -3434,6 +3436,9 @@
              confirmButtonText: '确定'
            })
          }
+          this.transferLoadFlag = false
+        }).catch(()=>{
+          this.transferLoadFlag = false
        })
      },

--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@ -501,8 +501,8 @@
      </el-table>
      </div>
      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
      </el-footer>
    </el-dialog>
@ -974,6 +974,7 @@
    data () {
      return {
        loadFlag: false,
+        transferLoadFlag: false,
        inspectionNo: '',
        fileFlag: false,
        fileContentList: [],
@ -3391,6 +3392,7 @@
        this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
        this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
        this.saveInformationData.type = type
+        this.transferLoadFlag = true
        // this.saveInformationData.subDetailList = this.acquisitionList
        saveFQCDetailedRecord(this.saveInformationData).then(({data}) => {
          if (data && data.code === 0) {
@ -3407,6 +3409,9 @@
              confirmButtonText: '确定'
            })
          }
+          this.transferLoadFlag = false
+        }).catch(()=>{
+          this.transferLoadFlag = false
        })
      },

--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@ -515,8 +515,8 @@
      </el-table>
      </div>
      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
      </el-footer>
    </el-dialog>
@ -995,6 +995,7 @@
    data () {
      return {
        loadFlag: false,
+        transferLoadFlag: false,
        inspectionNo: '',
        fileFlag: false,
        fileContentList: [],
@ -3470,6 +3471,7 @@
        this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
        this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
        this.saveInformationData.type = type
+        this.transferLoadFlag = true
        // this.saveInformationData.subDetailList = this.acquisitionList
        saveIPQCDetailedRecord(this.saveInformationData).then(({data}) => {
          if (data && data.code === 0) {
@ -3486,6 +3488,9 @@
              confirmButtonText: '确定'
            })
          }
+          this.transferLoadFlag = false
+        }).catch(()=>{
+          this.transferLoadFlag = false
        })
      },

--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@ -408,8 +408,8 @@
        </el-table>
      </div>
      <el-footer style="height:40px;margin-top: 20px;text-align:center">
-        <el-button v-if="detailData.state === '待检验'" type="primary" @click="Transfer('1')">应用</el-button>
-        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" @click="Transfer('2')">保存</el-button>
+        <el-button v-if="detailData.state === '待检验'" type="primary" :loading="transferLoadFlag" @click="Transfer('1')">应用</el-button>
+        <el-button v-if="detailData.state === '待检验' || detailData.state === '待审核'" type="primary" :loading="transferLoadFlag" @click="Transfer('2')">保存</el-button>
        <el-button type="primary" @click="detailInformationFlag=false">关闭</el-button>
      </el-footer>
    </el-dialog>
@ -720,6 +720,7 @@
    data () {
      return {
        loadFlag: false,
+        transferLoadFlag: false,
        // 是否收藏
        favorite: false,
        // 导出 start
@ -1867,6 +1868,8 @@
            })
          }
          this.loadFlag = false
+        }).catch(()=>{
+          this.loadFlag = false
        })
      },

@ -1897,6 +1900,8 @@
            })
          }
          this.loadFlag = false
+        }).catch(()=>{
+          this.loadFlag = false
        })
      },

@ -2339,6 +2344,7 @@
        this.saveInformationData.responsiblePerson = this.detailData.responsiblePerson
        this.saveInformationData.itemList = JSON.parse(JSON.stringify(this.detailList))
        this.saveInformationData.type = type
+        this.transferLoadFlag = true
        // this.saveInformationData.subDetailList = this.acquisitionList
        saveIQCDetailedRecord(this.saveInformationData).then(({data}) => {
          if (data && data.code === 0) {
@ -2355,6 +2361,9 @@
              confirmButtonText: '确定'
            })
          }
+          this.transferLoadFlag = false
+        }).catch(()=>{
+          this.transferLoadFlag = false
        })
      },

--- a/src/views/modules/qc/qcItem.vue
+++ b/src/views/modules/qc/qcItem.vue
@ -38,8 +38,8 @@
        </el-select>
      </el-form-item>
      <el-form-item :label="' '">
-        <el-button v-if="!authSearch" type="primary" @click="getDataList()">查询</el-button>
-        <el-button v-if="!authSave" type="primary" @click="addModal()">新增</el-button>
+        <el-button v-if="authSearch" type="primary" @click="getDataList()">查询</el-button>
+        <el-button v-if="authSave" type="primary" @click="addModal()">新增</el-button>
      </el-form-item>
      <el-form-item :label="' '">
        <el-button type="primary" icon="el-icon-upload" @click="qcUpload()">导入</el-button>
@ -88,8 +88,8 @@
        width="160"
        label="操作">
        <template slot-scope="scope">
-          <a v-if="!authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a>
-          <a v-if="!authDelete" type="text" size="small" @click="deleteModal(scope.row)">删除</a>
+          <a v-if="authUpdate" type="text" size="small" @click="updateModal(scope.row)">编辑</a>
+          <a v-if="authDelete" type="text" size="small" @click="deleteModal(scope.row)">删除</a>
          <a type="text" size="small" @click="itemObjectModal(scope.row)">采集设备配置</a>
        </template>
      </el-table-column>
@ -976,7 +976,7 @@
      this.inspectionTypeSearch()
      // 动态列
      this.getTableUserColumn(this.$route.meta.menuId+'table',1)
-      if (!this.authSearch) {
+      if (this.authSearch) {
        // 获取数据列表
        this.getDataList()
      }
@ -1597,10 +1597,10 @@
        let updateFlag = this.isAuth(this.menuId+":update")
        let deleteFlag = this.isAuth(this.menuId+":delete")
        //处理页面的权限数据
-        this.authSearch = !searchFlag
-        this.authSave = !saveFlag
-        this.authUpdate = !updateFlag
-        this.authDelete = !deleteFlag
+        this.authSearch = searchFlag
+        this.authSave = saveFlag
+        this.authUpdate = updateFlag
+        this.authDelete = deleteFlag
      },
    }
  }
--- a/src/views/modules/reportWorkOrder/reportDefectOrder.vue
+++ b/src/views/modules/reportWorkOrder/reportDefectOrder.vue
@ -1824,8 +1824,8 @@
          planID: row.planID,
          planOperatorName: row.planOperatorName,
          workTime: '',
-          remark: '',
-          disposalMeasures: '',
+          remark: row.remark,
+          disposalMeasures: row.disposalMeasures,
          mesUser: this.$store.state.user.name,
          itemList: [],
          defectID: row.defectID,
@ -1837,11 +1837,11 @@
          reachDate: row.reachDate,
          operator: row.reachOperator,
          operatorName: row.reachOperatorName,
-          handlingMethod: '',
+          handlingMethod: row.handlingMethod,
          feedBackDesc: row.feedBackDesc,
-          faultReason: '',
-          preventiveMeasure: '',
-          result: ''
+          faultReason: row.faultReason,
+          preventiveMeasure: row.preventiveMeasure,
+          result: row.result
        }
        this.activeTable = 'inspection_form'
        this.queryHistoryRecord()