优化

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

@@ -43,6 +43,16 @@
                 style="width: 130px"
                 />
             </el-form-item>
+          <el-form-item 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>
@@ -130,7 +140,12 @@
                 </el-button>
               </template>
             </el-table-column>
-          <el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true"/>
+          <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 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>
@@ -401,6 +416,10 @@ export default {
             costDetailTitle: '',
             costDetailList: [],
             costDetailType: '', // 当前查看的费用类型
+            proStatus:[
+              { id: 0, name: '未竣工' },
+              { id: 1, name: '已竣工' },
+            ],
         }
     },
     created() {
@@ -929,7 +948,7 @@ export default {
                     { key: 'loseCost', title: '丢失费用' },
                     { key: 'scrapCost', title: '报废费用' },
                     { key: 'costs', title: '合计费用（元）' },
-                    { key: 'proStatus', title: '工程状态' },
+                    { key: 'proStatus', title: '竣工状态' },
                     { key: 'actualEndDate', title: '竣工日期' }
                 ];
 
@@ -981,7 +1000,7 @@ export default {
                     { wch: 12 },  // 丢失费用
                     { wch: 12 },  // 报废费用
                     { wch: 15 },   // 合计费用
-                    { wch: 12 },  // 工程状态
+                    { wch: 12 },  // 竣工状态
                     { wch: 12 }   // 竣工日期
                 ];
                 worksheet['!cols'] = columnWidths;

src/views/material/stquery/deviceUsingRecord.vue

@@ -91,6 +91,16 @@
               </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item 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
@@ -139,7 +149,12 @@
           <el-table-column label="在用总价值（元）" align="center" prop="usPrice"></el-table-column>
           <!-- <el-table-column label="投入总价值（元）" align="center" prop="totalPrice" />-->
           <el-table-column label="协议状态" align="center" prop="isSltName" :show-overflow-tooltip="true"/>
-         <el-table-column label="工程状态" align="center" prop="proStatus" :show-overflow-tooltip="true"/>
+        <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 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
@@ -210,6 +225,10 @@ export default {
                 startTime:null,
                 endTime:null
             },
+          proStatus:[
+            { id: 0, name: '未竣工' },
+            { id: 1, name: '已竣工' },
+          ],
         }
     },
     created() {
@@ -293,7 +312,8 @@ export default {
               startTime: this.queryParams.startTime,
               endTime: this.queryParams.endTime,
               pageSize: this.queryParams.pageSize,
-              pageNum: this.queryParams.pageNum
+              pageNum: this.queryParams.pageNum,
+              isFinish : this.queryParams.isFinish
           }
           const res = await getProjUsingRecordListApi(params)
           if(res.data.rows.length>0){
@@ -310,6 +330,7 @@ export default {
               isSlt: this.queryParams.isSlt,
               startTime: this.queryParams.startTime,
               endTime: this.queryParams.endTime,
+              isFinish : this.queryParams.isFinish
           }
           const response = await getProjUsingRecordListNoPage(param)
             let obj = {
@@ -390,7 +411,8 @@ export default {
           startTime: this.queryParams.startTime,
           endTime: this.queryParams.endTime,
           pageSize: this.queryParams.pageSize,
-          pageNum: this.queryParams.pageNum
+          pageNum: this.queryParams.pageNum,
+          isFinish : this.queryParams.isFinish
         }
 
         const currentTime = formatTime(new Date());