优化

src/views/material/cost/component/leaseCostRangeReportHome.vue

@@ -31,6 +31,16 @@
                     <el-option label="已结算" value="1"></el-option>
                 </el-select>
             </el-form-item>
+          <el-form-item label="竣工状态" prop="isFinish">
+            <el-select v-model="queryParams.isFinish" placeholder="请选择竣工状态" clearable filterable>
+              <el-option
+                v-for="item in proStatus"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </el-select>
+          </el-form-item>
             <el-form-item>
                 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
                 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -94,6 +104,18 @@
                     {{ scope.row.remark || '-' }}
                 </template>
             </el-table-column>
+          <el-table-column label="竣工状态" align="center" prop="isFinish" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.isFinish == 1" effect="plain">已竣工</el-tag>
+              <el-tag v-else-if="scope.row.isFinish == 0" type="warning" effect="plain">未竣工</el-tag>
+              <template v-else>-</template>
+            </template>
+          </el-table-column>
+          <el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true" min-width="100">
+            <template slot-scope="scope">
+              {{ scope.row.actualEndDate || '-' }}
+            </template>
+          </el-table-column>
             <el-table-column label="操作" align="center" width="100" fixed="right">
                 <template slot-scope="scope">
                     <el-button size="mini" type="text" icon="el-icon-view" @click="handleViewDetails(scope.row)">详情</el-button>
@@ -249,6 +271,11 @@ export default {
                 startDate: null,
                 endDate: null,
             },
+            proStatus:[
+              { id: 0, name: '未竣工' },
+              { id: 1, name: '已竣工' },
+              { id: 2, name: '空白' },
+            ],
             // 详情弹窗相关
             detailDialogVisible: false,
             detailLoading: false,
@@ -422,6 +449,7 @@ export default {
                 const columns = [
                     { header: '序号', key: 'index', width: 8 },
                     { header: '协议号', key: 'agreementCode', width: 18 },
+                    { header: '分公司', key: 'impUnitName', width: 18 },
                     { header: '结算单位', key: 'unitName', width: 20 },
                     { header: '结算工程', key: 'projectName', width: 25 },
                     { header: '结算状态', key: 'isSettled', width: 10 },
@@ -435,7 +463,9 @@ export default {
                     { header: '最早租赁时间', key: 'earliestLeaseTime', width: 15 },
                     { header: '最晚归还时间', key: 'latestReturnTime', width: 15 },
                     { header: '结算时间', key: 'settlementTime', width: 12 },
-                    { header: '备注', key: 'remark', width: 20 }
+                    { header: '备注', key: 'remark', width: 20 },
+                    { header: '竣工状态', key: 'isFinish', width: 18 },
+                    { header: '竣工日期', key: 'actualEndDate', width: 18 }
                 ];
 
                 worksheet.columns = columns;
@@ -474,6 +504,7 @@ export default {
                     const dataRow = {
                         index: String(index + 1),  // 转换为字符串，避免被格式化为小数
                         agreementCode: row.agreementCode || '',
+                        impUnitName: row.impUnitName || '',
                         unitName: row.unitName || '',
                         projectName: row.projectName || '',
                         isSettled: row.isSettled === '1' ? '已结算' : '未结算',
@@ -487,7 +518,10 @@ export default {
                         earliestLeaseTime: row.earliestLeaseTime || '',
                         latestReturnTime: row.latestReturnTime || '',
                         settlementTime: row.settlementTime || '',
-                        remark: row.remark || ''
+                        remark: row.remark || '',
+                        isFinish:  row.isFinish === '1' ? '已竣工'
+                          : (row.isFinish === '0' ? '未竣工' : ''),
+                        actualEndDate: row.actualEndDate || ''
                     };
 
                     const newRow = worksheet.addRow(dataRow);

src/views/material/cost/component/lostReportHome.vue

@@ -202,6 +202,7 @@ export default {
             proStatus:[
               { id: 0, name: '未竣工' },
               { id: 1, name: '已竣工' },
+              { id: 2, name: '空白' },
             ],
         }
     },

src/views/material/cost/component/repairReportHome.vue

@@ -147,6 +147,7 @@ export default {
             proStatus:[
               { id: 0, name: '未竣工' },
               { id: 1, name: '已竣工' },
+              { id: 2, name: '空白' },
             ],
         }
     },

src/views/material/cost/component/reportHome.vue

@@ -419,6 +419,7 @@ export default {
             proStatus:[
               { id: 0, name: '未竣工' },
               { id: 1, name: '已竣工' },
+              { id: 2, name: '空白' },
             ],
         }
     },

src/views/material/cost/component/scrapReportHome.vue

@@ -145,6 +145,7 @@ export default {
             proStatus:[
               { id: 0, name: '未竣工' },
               { id: 1, name: '已竣工' },
+              { id: 2, name: '空白' },
             ],
         }
     },

src/views/material/cost/component/unreportHome.vue

@@ -186,6 +186,7 @@
                     <el-tag type="warning" v-if="scope.row.isFinish == 0" effect="plain">未竣工</el-tag>
                 </template>
             </el-table-column>
+          <el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true"/>
         </el-table>
 
        <pagination
@@ -711,6 +712,7 @@ export default {
             proStatus:[
                 { id: 0, name: '未竣工' },
                 { id: 1, name: '已竣工' },
+                { id: 2, name: '空白' },
             ],
 
 

src/views/material/repair/scrapManage/component/addToolsApply.vue

@@ -18,10 +18,10 @@
           disabled
         />
       </el-form-item>
-      <el-form-item label="退料单位" prop="backPro">
+      <el-form-item label="退料工程" prop="backPro">
         <el-input
           v-model="maForm.backPro"
-          placeholder="请输入退料单位"
+          placeholder="请输入退料工程"
           clearable
           maxlength="50"
           style="width: 240px"

src/views/material/repair/scrapManage/component/queryToolsApply.vue

@@ -18,10 +18,10 @@
           disabled
         />
       </el-form-item>
-      <el-form-item label="退料单位" prop="backPro">
+      <el-form-item label="退料工程" prop="backPro">
         <el-input
           v-model="maForm.backPro"
-          placeholder="请输入退料单位"
+          placeholder="请输入退料工程"
           clearable
           maxlength="50"
           style="width: 240px"

src/views/material/stquery/deviceUsingRecord.vue

@@ -101,6 +101,26 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="jijuType">
+          <el-select v-model="queryParams.jijuType" placeholder="请选择机具类型" clearable filterable>
+            <el-option
+              v-for="item in jijuType"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="isTeam">
+          <el-select v-model="queryParams.isTeam" placeholder="请选择是否班组" clearable filterable>
+            <el-option
+              v-for="item in isTeam"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item>
             <el-button
@@ -156,6 +176,18 @@
           </template>
         </el-table-column>
          <el-table-column label="竣工日期" align="center" prop="actualEndDate" :show-overflow-tooltip="true"/>
+        <el-table-column label="机具类型" align="center" prop="jijuType" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.jijuType == 1" effect="plain">施工机具</el-tag>
+            <el-tag type="warning" v-if="scope.row.jijuType == 2" effect="plain">安全工器具</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否班组" align="center" prop="isTeam" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.isTeam == 0" effect="plain">是</el-tag>
+            <el-tag type="warning" v-if="scope.row.isTeam == 1" effect="plain">否</el-tag>
+          </template>
+        </el-table-column>
       </el-table>
       <pagination
           v-show="total > 0"
@@ -228,6 +260,15 @@ export default {
           proStatus:[
             { id: 0, name: '未竣工' },
             { id: 1, name: '已竣工' },
+            { id: 2, name: '空白' },
+          ],
+          jijuType:[
+            { id: 1, name: '施工机具' },
+            { id: 2, name: '安全工器具' },
+          ],
+          isTeam:[
+            { id: 0, name: '是' },
+            { id: 1, name: '否' },
           ],
         }
     },
@@ -313,7 +354,9 @@ export default {
               endTime: this.queryParams.endTime,
               pageSize: this.queryParams.pageSize,
               pageNum: this.queryParams.pageNum,
-              isFinish : this.queryParams.isFinish
+              isFinish : this.queryParams.isFinish,
+              jijuType : this.queryParams.jijuType,
+              isTeam : this.queryParams.isTeam
           }
           const res = await getProjUsingRecordListApi(params)
           if(res.data.rows.length>0){
@@ -330,7 +373,9 @@ export default {
               isSlt: this.queryParams.isSlt,
               startTime: this.queryParams.startTime,
               endTime: this.queryParams.endTime,
-              isFinish : this.queryParams.isFinish
+              isFinish : this.queryParams.isFinish,
+              jijuType : this.queryParams.jijuType,
+              isTeam : this.queryParams.isTeam
           }
           const response = await getProjUsingRecordListNoPage(param)
             let obj = {
@@ -412,7 +457,9 @@ export default {
           endTime: this.queryParams.endTime,
           pageSize: this.queryParams.pageSize,
           pageNum: this.queryParams.pageNum,
-          isFinish : this.queryParams.isFinish
+          isFinish : this.queryParams.isFinish,
+          jijuType : this.queryParams.jijuType,
+          isTeam : this.queryParams.isTeam
         }
 
         const currentTime = formatTime(new Date());