设备领用测试问题修改

src/views/construction/deviceReceive/index.vue

@@ -58,6 +58,16 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item prop="isLy">
+          <el-select v-model="queryParams.isLy" placeholder="是否领用" clearable style="width: 100%;">
+            <el-option
+              v-for="item in lyList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item prop="lyTime">
           <el-date-picker
             v-model="queryParams.lyTime"
@@ -104,40 +114,64 @@
               <span>{{ (queryParams.pageNum - 1) * queryParams.pageSize + scope.$index + 1 }}</span>
             </template>
           </el-table-column>
-        <el-table-column label="工程名称" align="center" prop="proName" sortable/>
+        <el-table-column label="工程名称" align="center" prop="proName" sortable>
+          <!-- <template slot-scope="scope">
+          <el-popover
+            placement="top-start"
+            title
+            width="200"
+            trigger="hover"
+            :content="(scope.row.proName)"
+          >
+            <div class="maxsize" slot="reference">{{scope.row.proName}}</div>
+          </el-popover>
+        </template> -->
+      </el-table-column>
         <el-table-column label="项目部名称" align="center" prop="departName" sortable/>
-        <el-table-column label="作业杆塔名称" align="center" prop="powerName" sortable/>
+        <el-table-column label="杆塔编号" align="center" prop="powerName" sortable/>
         <el-table-column label="领用班组" align="center" prop="teamName" sortable/>
         <el-table-column label="领用设备类型" align="center" prop="deviceTypeName" sortable/>
         <el-table-column label="设备名称" align="center" prop="devName" sortable/>
         <el-table-column label="领用设备编码" align="center" prop="devCode" sortable/>
         <!-- <el-table-column label="班组负责人" align="center" prop="bindNum"></el-table-column> -->
-        <el-table-column label="领用时间" align="center" prop="lyTime" sortable/>
+        <el-table-column label="领用时间" align="center" prop="lyTime" sortable width="150"/>
-        <el-table-column label="归还时间" align="center" prop="ghTime" sortable>
+        <el-table-column label="归还时间" align="center" prop="ghTime" sortable width="150">
           <template slot-scope="scope">
             <span v-if="!scope.row.ghTime" style="font-weight: bold;color: green;">在用</span>
             <span v-else>{{ scope.row.ghTime }}</span>
           </template>
         </el-table-column>
-      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="备注" align="center" prop="remarks">
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
-          <template slot-scope="scope">
+          <el-popover
-            <!-- <el-button
+            placement="top-start"
-              size="mini"
+            title
-              type="text"
+            width="200"
-              icon="el-icon-edit"
+            trigger="hover"
-              @click="handleUpdate(scope.row)" 
+            :content="(scope.row.remarks)"
-            >编辑</el-button> -->
+          >
-            <el-button
+            <div class="maxsize" slot="reference">{{scope.row.remarks}}</div>
-              size="mini"
+          </el-popover>
-              type="text"
+        </template>
-              icon="el-icon-delete" 
+      </el-table-column>
-              v-hasPermi="['basic:equipmentReq:returnDevice']"
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-              v-if="!scope.row.ghTime"
+        <template slot-scope="scope">
-              @click="returnDevice(scope.row)" 
+          <!-- <el-button
-            >归还</el-button>
+            size="mini"
-          </template>
+            type="text"
-        </el-table-column>
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)" 
+          >编辑</el-button> -->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete" 
+            v-hasPermi="['basic:equipmentReq:returnDevice']"
+            v-if="!scope.row.ghTime"
+            @click="returnDevice(scope.row)" 
+          >归还</el-button>
+        </template>
+      </el-table-column>
       </el-table>
   
       <pagination
@@ -228,7 +262,7 @@
 
           <el-col :span="24">
               <el-form-item label="备 注" prop="remarks">
-                  <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" />
+                  <el-input v-model="form.remarks" type="textarea" placeholder="请输入备注" maxlength="100"/>
               </el-form-item>
           </el-col>
         </el-form>
@@ -262,7 +296,6 @@
       return {
         // 遮罩层
         loading: true,
- 
         // 选中数组
         ids: [],
         // 非单个禁用
@@ -271,6 +304,7 @@
         multiple: true,
         // 显示搜索条件
         showSearch: true,
+        lyList:[{id:'0',name:'在用'},{id:'1',name:'归还'}],
         // 总条数
         total: 0,
         //绑定设备总条数
@@ -293,11 +327,15 @@
         queryParams: {
           pageNum: 1,
           pageSize: 10,
-          // sidebandName: undefined,
+          proName:'',
-          // sidebandCode: undefined,
+          powerName:'',
-          // projectName: undefined,
+          teamName:'',
-          // gtCode: undefined,
+          devName:'',
-          // bindTime: undefined,
+          devCode:'',
+          devType:'',
+          isLy:'',
+          lyTime:'',
+          ghTime:'',
         },
         stateList:['在用','未用'], 
         // 表单参数
@@ -394,7 +432,9 @@
         getPowerLists(proId){
           getPowerLists({proId:proId}).then(response => {
                this.GtList = response.data;
-            });
+               this.$set(this.form,'powerId','')
+              //  this.form.powerId=''
+           });
         },
         //添加设备
         addDevice() {
@@ -412,7 +452,6 @@
               item.devCode=''
             }
           })
-          
         },
         //聚焦设备列表select时根据类型更新下拉数据
         focusDevice(type){
@@ -525,4 +564,9 @@
           display: none;
       }
   }
+  .maxsize {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
   </style>