取消默认选中，增加结算状态

src/views/business-examine/receive-apply/index.vue

@@ -189,9 +189,9 @@ export default {
         } else {
             this.userId = sessionStorage.getItem('userId')
             // 设置默认状态为第一个选项（待审核）
-            if (this.statusOptions.length > 0) {
+            // if (this.statusOptions.length > 0) {
-                this.queryParams.taskStatus = this.statusOptions[0].value
+            //     this.queryParams.taskStatus = this.statusOptions[0].value
-            }
+            // }
             // if (this.statusOptions.length > 1) {
             //     this.queryParams.taskStatus = this.statusOptions[1].value
             // }

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

@@ -13,17 +13,6 @@
                     :multiple="true"
                 >
             </treeselect>
-                <!-- <el-cascader v-model="unitIds"
-                    :show-all-levels="false"
-                    :options="unitList"
-                    :props="selectTreeProps"
-                    filterable
-                    clearable
-                    collapse-tags
-                    @change="unitChange"
-                    popper-class="popper-select"
-                    placeholder="请选择单位"
-                ></el-cascader>  -->
             </el-form-item>
             <el-form-item prop="projectIds">
                 <treeselect
@@ -33,15 +22,6 @@
                     noChildrenText="没有数据了" noOptionsText="没有数据" noResultsText="没有搜索结果"
                     placeholder="请选择结算工程" @select="proChange" :disabled="unitIds.length == 0"
                 />
-                <!-- <el-cascader v-model="projectIds"
-                        :show-all-levels="false"
-                        :options="proList"
-                        :props="selectTreeProps"
-                        filterable clearable
-                        collapse-tags
-                        @change="proChange"
-                        placeholder="请选择工程"
-                    ></el-cascader>  -->
             </el-form-item>
             <el-form-item prop="agreementCode">
                 <el-input v-model="queryParams.agreementCode" placeholder="请输入协议号" clearable style="width: 240px"/>
@@ -82,13 +62,6 @@
                     @click="handleApplyList"
                     >批量结算</el-button
                 >
-                <!-- <el-button
-                    type="primary"
-                    plain
-                    size="mini"
-                    @click="openPrintDialog"
-                    >协议书</el-button
-                > -->
             </el-form-item>
         </el-form>
 
@@ -111,25 +84,28 @@
             </el-table-column>
             <el-table-column label="结算状态" align="center" prop="sltStatus" :show-overflow-tooltip="true">
                 <template slot-scope="scope">
-                    <dict-tag :options="dict.type.cost_status" :value="scope.row.sltStatus"/>
+                    <dict-tag :options="dict.type.cost_status" :value="scope.row.isSlt"/>
                 </template>
-                <!-- <template slot-scope="scope">
+<!--                <template slot-scope="scope">-->
-                    <span v-if="scope.row.sltStatus == '0'">未结算</span>
+<!--                  <dict-tag :value="scope.row.sltStatus">-->
-                    <span v-if="scope.row.sltStatus == '1'">已结算</span>
+<!--                    <el-tag size="mini" type="success" v-if="scope.row.auditStatus == 1">已结算</el-tag>-->
-                    <span v-if="scope.row.sltStatus == '2'">已审核</span>
+<!--                    <el-tag size="mini" type="danger" v-if="scope.row.auditStatus == 2">部分结算</el-tag>-->
-                    <span v-if="scope.row.sltStatus == '3'">已驳回</span>
+<!--                    <el-tag size="mini" type="primary" v-if="scope.row.auditStatus == 0">未结算</el-tag>-->
-                </template> -->
+<!--                  </dict-tag>-->
+
+<!--                  <span v-if="scope.row.sltStatus == '0'">未结算</span>-->
+<!--                  <span v-if="scope.row.sltStatus == '1'">已结算</span>-->
+<!--                  <span v-if="scope.row.sltStatus == '2'">部分结算</span>-->
+<!--                </template>-->
             </el-table-column>
             <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true"/>
-            <!-- <el-table-column label="租赁期限(天)" align="center" prop="leaseDay" :show-overflow-tooltip="true" />
-            <el-table-column label="授权人" align="center" prop="authPerson" :show-overflow-tooltip="true" />
-            <el-table-column label="联系电话 " align="center" prop="phone" :show-overflow-tooltip="true" /> -->
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                     <el-button size="mini" type="primary" icon="el-icon-edit"
                         @click="handleApply(scope.row)"
-                        v-if="scope.row.sltStatus == '0' || (scope.row.sltStatus == '3')"
+                        v-if="scope.row.isSlt == '0' || (scope.row.isSlt == '2')"
-                        >结算申请</el-button>
+                        >结算申请
+                    </el-button>
 
                     <el-button
                         type="primary"
@@ -285,12 +261,6 @@ export default {
                 value: 'id',
                 multiple: true,//false
             },
-            // statusList: [
-            //     { id: '1', name: '未结算' },
-            //     { id: '2', name: '已结算' },
-            //     { id: '3', name: '已审核' },
-            //     { id: '4', name: '已驳回' },
-            // ],
             // 表格数据
             tableList: [],
             // 查询参数

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

@@ -44,25 +44,16 @@
             <el-form-item prop="sltStatus">
                 <el-select v-model="queryParams.sltStatus" placeholder="请选择结算状态" clearable filterable>
                     <el-option
-                    v-for="dict in dict.type.cost_status"
+                    v-for="dict in statusList"
-                        :key="dict.value"
+                        :key="dict.id"
-                        :label="dict.label"
+                        :label="dict.name"
-                        v-if="dict.value !== '0'"
+                        :value="dict.id"
-                        :value="dict.value"
                     ></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>
-                <!-- <el-button
-                    type="primary"
-                    plain
-                    size="mini"
-                    @click="openPrintDialog"
-                    >协议书</el-button
-                > -->
-               
             </el-form-item>
         </el-form>
 
@@ -78,21 +69,33 @@
             <el-table-column label="结算单位" align="center" prop="unitName" />
             <el-table-column label="结算工程" align="center" prop="projectName" />
             <el-table-column label="合计费用（元）" align="center" prop="costs" :show-overflow-tooltip="true">
-                <template slot-scope="scope" v-if="scope.row.costs != null && scope.row.costs!=''">
+                <template slot-scope="scope" v-if="scope.row.costs != null && scope.row.costs != ''">
                   {{ scope.row.costs.toFixed(2) }}
                 </template>
+              <template slot-scope="scope" v-if="scope.row.costs == null || scope.row.costs === '' || scope.row.costs === 0">
+                {{ 0.00 }}
+              </template>
             </el-table-column>
+
+          <el-table-column label="结算类型" align="center" prop="sltStatus" :show-overflow-tooltip="true">
+            <template slot-scope="scope">
+              <el-tag v-if="scope.row.settlementType === 1" effect="plain">工器具</el-tag>
+              <el-tag type="warning" v-if="scope.row.settlementType === 2" effect="plain">安全工器具</el-tag>
+              <el-tag v-if="scope.row.settlementType == null || scope.row.settlementType === 0" effect="plain">总费用</el-tag>
+            </template>
+          </el-table-column>
+
             <el-table-column label="审批人" align="center" prop="auditor" :show-overflow-tooltip="true"/>
             <el-table-column label="审批时间" align="center" prop="auditTime" width="100"/>
             <el-table-column label="结算状态" align="center" prop="sltStatus" :show-overflow-tooltip="true">
+<!--                <template slot-scope="scope">-->
+<!--                    <dict-tag :options="dict.type.cost_status" :value="scope.row.sltStatus"/>-->
+<!--                </template>-->
                 <template slot-scope="scope">
-                    <dict-tag :options="dict.type.cost_status" :value="scope.row.sltStatus"/>
+                  <el-tag v-if="scope.row.sltStatus == '1'">待审核</el-tag>
+                  <el-tag type="success" v-if="scope.row.sltStatus == '2'">审核通过</el-tag>
+                  <el-tag type="danger" v-if="scope.row.sltStatus == '3'">审核驳回</el-tag>
                 </template>
-                <!-- <template slot-scope="scope">
-                    <span v-if="scope.row.status == '0'">待审核</span>
-                    <span v-if="scope.row.status == '1'">审核通过</span>
-                    <span v-if="scope.row.status == '2'">审核驳回</span>
-                </template> -->
             </el-table-column>
             <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
@@ -272,11 +275,11 @@ export default {
                 value: 'id',
                 // multiple: true,//false
             },
-            // statusList: [
+            statusList: [
-            //     { id: '0', name: '待审核' },
+                { id: '1', name: '待审核' },
-            //     { id: '1', name: '审核通过' },
+                { id: '2', name: '审核通过' },
-            //     { id: '2', name: '审核驳回' },
+                { id: '3', name: '审核驳回' },
-            // ], //集合
+            ], //集合
             // 表格数据
             tableList: [],
             // 查询参数