sgzb-ui/src/views/claimAndRefund/constructionSite/constructionSite.vue

@@ -274,7 +274,7 @@
             />
           </el-form-item>
           <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleDialogQuery">查询</el-button>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
             <el-button icon="el-icon-refresh" size="mini" @click="resetDialogQuery">重置</el-button>
           </el-form-item>
         </el-row>
@@ -431,7 +431,6 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
-      dialogId: undefined,
       openPrint: false,
       handleState: 0, //0新增1查看2审批
       dialogLoading: false,
@@ -592,8 +591,8 @@ export default {
     /** 查询设备列表 */
     getDialogList() {
       this.dialogLoading = true
+
       let param = {
-        keyWord:this.dialogParams.keyWord,
         agreementId: this.dialogParams.backAgreementId,
       }
       getUseringData(param).then(response => {
@@ -653,24 +652,11 @@ export default {
         }
       }
     },
-    /** 搜索按钮操作 */
-    handleDialogQuery() {
-      if(this.handleState == 0){
-        this.getDialogList()
-      }else{
-        this.getDetail()
-      }
-    },
-     /** 重置按钮操作 */
     resetDialogQuery() {
-      if(this.handleState == 0){
+      this.resetForm('dialogForm')
-        this.$set(this.dialogParams,'keyWord','')
+      this.getDialogList()
-        this.getDialogList()
-      }else{
-        this.$set(this.dialogParams,'keyWord','')
-        this.getDetail()
-      }
     },
+
     /** 工地直转--打开弹窗 */
     handleAdd() {
       this.resetForm('dialogForm')
@@ -722,30 +708,23 @@ export default {
       })
     },
     handleView(row) {
-      console.log(row, '查看')
+      let param = { id: row.id }
-      this.dialogId = row.id;
+      this.getDetail(param)
-      this.getDetail()
       this.open = true
       this.handleState = 1
     },
     /** 修改按钮操作 */
     handleExame(row) {
       console.log(row, '审核')
-      this.dialogId = row.id;
+      let param = { id: row.id }
-      this.getDetail()
+      this.getDetail(param)
       this.open = true
       this.handleState = 2
     },
-    getDetail() {
+    getDetail(param) {
-      let param = {
-        keyWord:this.dialogParams.keyWord,
-        id:this.dialogId
-      }
       getDetailInfo(param).then(res => {
         if (res.code == 200) {
-          let keyWord = this.dialogParams.keyWord;
+          this.dialogParams = res.data
-          this.dialogParams = res.data;
-          this.dialogParams.keyWord = keyWord
           this.$set(this.dialogParams, 'backUnitId', Number(res.data.backUnitId))
           this.$set(this.dialogParams, 'backProId', Number(res.data.backProId))
           // this.$set(this.dialogParams,'backAgreementCode',res.data.tagreementCode)
@@ -753,7 +732,6 @@ export default {
           this.$set(this.dialogParams, 'leaseProId', Number(res.data.leaseProId))
           this.deviceList = res.data.directApplyDetails
           this.deviceList.forEach(item => {
-            item.typeName = item.kindName
             item.typeModelName = item.modelName
             // item.num = item.useNum
           })