费用结算

sgzb-ui/src/api/claimAndRefund/return.js

@@ -9,7 +9,16 @@ export function ApiGetBackApplyList(query) {
   })
 }
 
-// 退料审核新增
+// 退料审核列表
+export function getBackAuditList(query) {
+  return request({
+    url: '/material/backApply/getBackAuditList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 退料申请新增
 export function ApiSubmitBackApply(query) {
   return request({
     url: '/material/backApply/submitBackApply',

sgzb-ui/src/api/cost/cost.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+// 查询费用结算列表
+export function getSltAgreementInfo(query) {
+    return request({
+      url: '/material/sltAgreementInfo/getSltAgreementInfo',
+      method: 'get',
+      params: query
+    })
+  }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue

@@ -496,7 +496,7 @@
 
 <script>
 import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
-import { ApiGetBackApplyList, ApiGetView, ApiBackApplyAudit } from "@/api/claimAndRefund/return.js"
+import { getBackAuditList, ApiGetView, ApiBackApplyAudit } from "@/api/claimAndRefund/return.js"
 import {
   getInfo, h
 } from "@/api/login";
@@ -608,7 +608,7 @@ export default {
           ...this.queryParams
         }
         console.log("paramsparamsparams", params)
-        const res = await ApiGetBackApplyList(params)
+        const res = await getBackAuditList(params)
         this.typeList = res.data.rows;
         this.total = res.data.total;
         this.loading = false;

sgzb-ui/src/views/cost/csotSettlement/costApplyAdd.vue

@@ -38,13 +38,13 @@
                 <el-table-column label="外部租赁费用" align="center" prop="remark" :show-overflow-tooltip="true" />
             </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
             v-show="total>0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
-        />        
+        />         -->
         <div style="width: 100%;text-align: right;padding: 20px 20px;">租赁费用小计：97010.08</div>
       </div>
 
@@ -63,13 +63,13 @@
                  
             </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
             v-show="total>0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
-        />        
+        />         -->
         <div style="width: 100%;text-align: right;padding: 20px 20px;">维修费用小计：230</div>
       </div>
 
@@ -88,13 +88,13 @@
                 <el-table-column label="维修费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
             </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
             v-show="total>0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
-        />        
+        />         -->
         <div style="width: 100%;text-align: right;padding: 20px 20px;">报废费用小计：230</div>
       </div>
 
@@ -112,13 +112,13 @@
                 <el-table-column label="丢失费用" align="center" prop="planStartTime" :show-overflow-tooltip="true" />
             </el-table-column>
         </el-table>
-        <pagination
+        <!-- <pagination
             v-show="total>0"
             :total="total"
             :page.sync="queryParams.pageNum"
             :limit.sync="queryParams.pageSize"
             @pagination="getList"
-        />        
+        />         -->
         <div style="width: 100%;text-align: right;padding: 20px 20px;">丢失费用小计：230</div>
       </div>
   

sgzb-ui/src/views/cost/csotSettlement/costApplyList.vue

@@ -1,255 +1,259 @@
 <template>
-    <div class="app-container" id="agreement">
+  <div class="app-container" id="agreement">
-      <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="80px">
-        <el-form-item label="结算单位" prop="unitId">
+      <el-form-item label="结算单位" prop="unitId">
-          <el-select v-model="queryParams.unitId" placeholder="请选择往来单位"  clearable>
+        <el-select v-model="queryParams.unitId" placeholder="请选择往来单位"  clearable>
-              <el-option
+            <el-option
-                v-for="item in unitList"
+              v-for="item in unitList"
-                :key="item.unitId"
+              :key="item.unitId"
-                :label="item.unitName"
+              :label="item.unitName"
-                :value="item.unitId"
+              :value="item.unitId"
-              ></el-option>
+            ></el-option>
-            </el-select>
+          </el-select>
-        </el-form-item>
+      </el-form-item>
-        <el-form-item label="结算工程" prop="projectId">
+      <el-form-item label="结算工程" prop="projectId">
-           <el-select v-model="queryParams.projectId" placeholder="请选择工程名称"  clearable>
+         <el-select v-model="queryParams.projectId" placeholder="请选择工程名称"  clearable>
-              <el-option
+            <el-option
-                v-for="item in projectList"
+              v-for="item in projectList"
-                :key="item.projectId"
+              :key="item.projectId"
-                :label="item.projectName"
+              :label="item.projectName"
-                :value="item.projectId"
+              :value="item.projectId"
-              ></el-option>
+            ></el-option>
-            </el-select>
+          </el-select>
-        </el-form-item>
+      </el-form-item>
-        <el-form-item label="结算状态" prop="projectId">
+      <el-form-item label="结算状态" prop="sltStatus">
-           <el-select v-model="queryParams.projectId" placeholder="请选择结算状态"  clearable>
+         <el-select v-model="queryParams.sltStatus" placeholder="请选择结算状态"  clearable>
-              <el-option
+            <el-option
-                v-for="item in statusList"
+              v-for="item in statusList"
-                :key="item.id"
+              :key="item.id"
-                :label="item.name"
+              :label="item.name"
-                :value="item.id"
+              :value="item.id"
-              ></el-option>
+            ></el-option>
-            </el-select>
+          </el-select>
-        </el-form-item>
+      </el-form-item>
-        <el-form-item>
+      <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</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="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button
+          type="primary"
+          plain
+          size="mini"
+        >批量结算</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="序号" align="center" type="index"  width="60"/>
+      <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
+      <!-- <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" />
+      <el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true" />
+      <el-table-column label="签订日期" align="center" prop="signTime" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
+      <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
+      <el-table-column label="合计费用" align="center" prop="cost" :show-overflow-tooltip="true" />
+      <el-table-column label="结算状态" align="center" prop="sltStatus" :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" prop="remark" :show-overflow-tooltip="true" /> -->
+      <el-table-column label="操作" align="center" width="300" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
           <el-button 
-            type="primary"
-            plain
-            size="mini"
-          >批量结算</el-button>
-        </el-form-item>
-      </el-form>
-  
-      <el-table v-loading="loading" :data="agreementList" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="序号" align="center" type="index"  width="60"/>
-        <el-table-column label="协议编号" align="center" prop="agreementCode" :show-overflow-tooltip="true" />
-        <!-- <el-table-column label="合同编号" align="center" prop="contractCode" :show-overflow-tooltip="true" />
-        <el-table-column label="附件图片" align="center" prop="fileName" :show-overflow-tooltip="true" />
-        <el-table-column label="签订日期" align="center" prop="signTime" :show-overflow-tooltip="true" /> -->
-        <el-table-column label="结算单位" align="center" prop="unitName" :show-overflow-tooltip="true" />
-        <el-table-column label="结算工程" align="center" prop="projectName" :show-overflow-tooltip="true" />
-        <el-table-column label="合计费用" align="center" prop="planStartTime" :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" prop="remark" :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)"
-            >结算申请</el-button>
-            <el-button
               size="mini"
-              type="danger" 
+              type="primary" 
-              icon="el-icon-delete"
+              icon="el-icon-edit"
-              @click="handleDelete(scope.row)"
+              @click="handleApply(scope.row)"
-            >撤销申请</el-button>
+          >结算申请</el-button>
-          </template>
+          <!-- <el-button
-        </el-table-column>
+            size="mini"
-      </el-table>
+            type="danger" 
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >撤销申请</el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
 
-      <pagination
+    <pagination
-        v-show="total>0"
+      v-show="total>0"
-        :total="total"
+      :total="total"
-        :page.sync="queryParams.pageNum"
+      :page.sync="queryParams.pageNum"
-        :limit.sync="queryParams.pageSize"
+      :limit.sync="queryParams.pageSize"
-        @pagination="getList"
+      @pagination="getList"
-      />
+    />
 
-    </div>
+  </div>
-  </template>
+</template>
 
-  <script>
+<script>
-  import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
+import { getAgreementList,getUnitList, getProjectList } from "@/api/claimAndRefund/receive";
-  export default {
+import { getSltAgreementInfo } from "@/api/cost/cost";
-    name: "Agreement",
-    dicts: ['sys_normal_disable'],
-    data() {
-      return {
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 往来单位数据
-        unitList: [],
-        // 工程数据
-         projectList: [],
-         statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
-        // 表格数据
-        agreementList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        open: false,
-        // 日期范围
-        dateRange: [],
-        // 查询参数
-        queryParams: {
-          pageNum: 1,
-          pageSize: 10,
-          keyWord: undefined,
 
-        },
-        // 表单参数
-        form: {},
-        //图片上传
-        uploadHeader: process.env.VUE_APP_BASE_API,
-        imageUrl:'',
-        imageName:'',
-        fileList:[],
-        field101fileList:[],
-        dialogImageUrl: '',
-        dialogVisible: false,
-        //上传地址
-        // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
-        // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
-        uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
-        // 表单校验
-        rules: {
-          contractCode: [
-            { required: true, message: "合同编号不能为空", trigger: "blur" }
-          ],
-          signTime: [
-            { required: true, message: "签订日期不能为空", trigger: "blur" }
-          ],
-          unitName: [
-            { required: true, message: "往来单位不能为空", trigger: "blur" }
-          ],
-          projectName: [
-            { required: true, message: "工程名称不能为空", trigger: "blur" }
-          ]
-        },
-        peopleOpen:false,
-        noticeOpen:false,
-        nform:{
-          notice:''
-        },
-        nrules: {
-          notice: [
-            { required: true, message: "通知内容不能为空", trigger: "blur" }
-          ]
-        },
-        deptName: undefined,
-      };
-    },
-    created() {
-      this.getList();
-      this.getUnitList();
-      this.getProjectList();
 
-    },
+export default {
-    methods: {
+  name: "Agreement",
-      //获取单位类型 ,getUnitList, getProjectList
+  dicts: ['sys_normal_disable'],
-      getUnitList(){
+  data() {
-        getUnitList().then(response => {
+    return {
-          this.unitList =  response.data;
+      // 遮罩层
-          })
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 往来单位数据
+      unitList: [],
+      // 工程数据
+       projectList: [],
+       statusList:[{id:'0',name:'请选择'},{id:'1',name:'已结算'},{id:'2',name:'未结算'},{id:'3',name:'待审核'}], //集合
+      // 表格数据
+      agreementList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 日期范围
+      dateRange: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        keyWord: undefined,
+       
       },
-      getProjectList(){
+      // 表单参数
-        getProjectList().then(response => {
+      form: {},
-          this.projectList =  response.data;
+      //图片上传
-          })
+      uploadHeader: process.env.VUE_APP_BASE_API,
+      imageUrl:'',
+      imageName:'',
+      fileList:[],
+      field101fileList:[],
+      dialogImageUrl: '',
+      dialogVisible: false,
+      //上传地址
+      // uploadUrl:'http://192.168.0.14:21624/system',//线上服务器地址+system
+      // uploadUrl:'http://112.29.103.165:21626/system',//线上服务器地址+system
+      uploadUrl: process.env.VUE_APP_BASE_API + "/system", // 上传的图片服务器地址
+      // 表单校验
+      rules: {
+        contractCode: [
+          { required: true, message: "合同编号不能为空", trigger: "blur" }
+        ],
+        signTime: [
+          { required: true, message: "签订日期不能为空", trigger: "blur" }
+        ],
+        unitName: [
+          { required: true, message: "往来单位不能为空", trigger: "blur" }
+        ],
+        projectName: [
+          { required: true, message: "工程名称不能为空", trigger: "blur" }
+        ]
       },
+      peopleOpen:false,
+      noticeOpen:false,
+      nform:{
+        notice:''
+      },
+      nrules: {
+        notice: [
+          { required: true, message: "通知内容不能为空", trigger: "blur" }
+        ]
+      },
+      deptName: undefined,
+    };
+  },
+  created() {
+    this.getList();
+    this.getUnitList();
+    this.getProjectList();
 
-      /** 查询字典类型列表 */
+  },
-      getList() {
+  methods: {
-        this.loading = true;
+    //获取单位类型 ,getUnitList, getProjectList
-        getAgreementList(this.queryParams).then(response => {
+    getUnitList(){
-            this.agreementList = response.rows;
+      getUnitList().then(response => {
-            this.total = response.total;
+        this.unitList =  response.data;
-            this.loading = false;
-          }
-        );
-      },
- 
-      
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.dateRange = [];
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      //结算申请
-      handleApply(row){
-        this.$tab.closeOpenPage({
-            path:'/cost/cost/costApplyAdd',
-            query:{
-                isEdit:true
-            }
         })
-      },
+    },
+    getProjectList(){
+      getProjectList().then(response => {
+        this.projectList =  response.data;
+        })
+    },
     
-      // 多选框选中数据
+    /** 查询字典类型列表 */
-      handleSelectionChange(selection) {
+    getList() {
-        this.ids = selection.map(item => item.agreementId)
+      this.loading = true;
-        this.single = selection.length!=1
+      getSltAgreementInfo(this.queryParams).then(response => {
-        this.multiple = !selection.length
+          this.agreementList = response.rows;
-      },
+          this.total = response.total;
+          this.loading = false;
+        }
+      );
+    },
 
-      /** 删除按钮操作 */
+    
-      handleDelete(row) {
+    /** 搜索按钮操作 */
-        // const agreementId = row.agreementId;
+    handleQuery() {
-        // let param = {
+      this.queryParams.pageNum = 1;
-        //   agreementId:row.agreementId+''
+      this.getList();
-        // }
+    },
-        // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+    /** 重置按钮操作 */
-        //   return removeAgreement(param);
+    resetQuery() {
-        // }).then(() => {
+      this.dateRange = [];
-        //   this.getList();
+      this.resetForm("queryForm");
-        //   this.$modal.msgSuccess("删除成功");
+      this.handleQuery();
-        // }).catch(() => {});
+    },
-      },
+    //结算申请
-      /** 导出按钮操作 */
+    handleApply(row){
-      handleExport() {
+      this.$tab.closeOpenPage({
-        // this.download('material/agreementInfo/export', {
+          path:'/cost/cost/costApplyAdd',
-        //   ...this.queryParams
+          query:{
-        // }, `协议_${new Date().getTime()}.xlsx`)
+              isEdit:true
-      },
+          }
-    }
+      }) 
-  };
+    },
-  </script>
+
-  <style lang="scss" scoped>
+    // 多选框选中数据
-  ::v-deep.el-table .fixed-width .el-button--mini {
+    handleSelectionChange(selection) {
-    width: 80px !important;
+      this.ids = selection.map(item => item.agreementId)
-    margin-bottom: 10px;
+      this.single = selection.length!=1
+      this.multiple = !selection.length
+    },
+
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      // const agreementId = row.agreementId;
+      // let param = {
+      //   agreementId:row.agreementId+''
+      // }
+      // this.$modal.confirm('是否确认删除该数据项？').then(function() {
+      //   return removeAgreement(param);
+      // }).then(() => {
+      //   this.getList();
+      //   this.$modal.msgSuccess("删除成功");
+      // }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // this.download('material/agreementInfo/export', {
+      //   ...this.queryParams
+      // }, `协议_${new Date().getTime()}.xlsx`)
+    },
   }
-  </style>
+};
+</script>
+<style lang="scss" scoped>
+::v-deep.el-table .fixed-width .el-button--mini {
+  width: 80px !important;
+  margin-bottom: 10px;
+}
+</style>