jz.kai 3 rokov pred
rodič
commit
7c91c6d25a

+ 14 - 0
src/api/base/contract.js

@@ -0,0 +1,14 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/contract/pageList", formData);
+}
+
+function childList(formData){
+  return request.post(constant.serverUrl + "/base/contract/childList", formData);
+}
+
+export default {
+  pageList,childList
+}

+ 10 - 1
src/routers/modules/base.js

@@ -23,7 +23,16 @@ var routers = [
         component: () => import('@/views/base/auditing-list.vue'),
         meta: {
             roles: ["admin"],
-            title: '审核信息管理'
+            title: '审核发票信息'
+        }
+    },
+    {
+        path: '/base/contract/list',
+        name: 'BaseContractList',
+        component: () => import('@/views/base/contract-list.vue'),
+        meta: {
+            roles: ["admin"],
+            title: '审核合同信息'
         }
     },
     {

+ 4 - 39
src/views/Home.vue

@@ -7,7 +7,7 @@
       </el-breadcrumb-item>
     </el-breadcrumb>
     <el-divider></el-divider>
-    <el-card class="diagram_jkgs" style="padding-left:-10px">
+    <!-- <el-card class="diagram_jkgs" style="padding-left:-10px">
       <el-button style="font-size:24px" type="primary" @click="openView">
         健康<br/>公示
       </el-button>
@@ -33,45 +33,10 @@
           <span>总人数量</span>
         </div>
       </div>
-    </el-card>
-    <el-card class="diagram_top">
-      <div class="ax_default xtsyqk_fyy">
-        <div class="xtsyqk_fyy_60">
-          <i class="el-icon-sunny"></i>
-          <span style="color:#01447D">
-            <b v-text="normalDays"></b>
-          </span>
-          <span>累积无异常天数</span>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="diagram_extraWide">
-      <div class="ax_default2 xtsyqk_fyy">
-        <div class="xtsyqk_fyy_60">
-          <i class="el-icon-search"></i>
-          <span style="color:#01447D">
-            <b v-text="dayCheckNum"></b>/
-            <b v-text="totalCheckNum"></b>
-          </span>
-          <span>当日检测人次 / 累计检测人次</span>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="diagram_extraWide">
-      <div class="ax_default2 xtsyqk_fyy">
-        <div class="xtsyqk_fyy_60">
-          <i class="el-icon-warning-outline"></i>
-          <span style="color:#01447D">
-            <b v-text="dayAbnormalNum"></b>/
-            <b v-text="totalAbnormalNum"></b>
-          </span>
-          <span>当日异常人数 / 累计异常人数</span>
-        </div>
-      </div>
-    </el-card>
-    <el-card class="diagram">
+    </el-card> -->
+    <!-- <el-card class="diagram">
       <div id="everyDayMeasuringDiv" style="width:100%;height: 280px;"></div>
-    </el-card>
+    </el-card> -->
   </div>
 </template>
 <script>

+ 2 - 2
src/views/base/auditing-detail.vue

@@ -61,7 +61,7 @@ export default {
 
     //审批流程图
     var parameters = new FormData();
-    parameters.append("invoiceId", self.businessKey);
+    parameters.append("auditingId", self.businessKey);
     auditingStepApi
     .auditingStepData(parameters)
     .then(function (response) {
@@ -75,7 +75,7 @@ export default {
 
     //对比数据
     var formData = new FormData();
-    formData.append("PBVID", self.businessKey);
+    formData.append("auditingId", self.businessKey);
     purBillVouchApi
     .compareResults(formData)
     .then(function (response) {

+ 1 - 1
src/views/base/auditing-list.vue

@@ -223,7 +223,7 @@ export default {
     },
     handleEdit(record) {
       this.modalTitle = "详情";
-      this.businessKey = record.invoiceId;
+      this.businessKey = record.id;
       this.showModal = true;
     },
     handleNext(record) {

+ 4 - 4
src/views/base/auditing-next.vue

@@ -65,7 +65,7 @@ export default {
       var self = this;
       
       var formData = new FormData();
-      formData.append("invoiceId", self.businessKey);
+      formData.append("auditingId", self.businessKey);
       formData.append("opinion", self.opinion);
       auditingStepApi
       .auditingStepNext(formData)
@@ -88,7 +88,7 @@ export default {
       var self = this;
       
       var formData = new FormData();
-      formData.append("invoiceId", self.businessKey);
+      formData.append("auditingId", self.businessKey);
       formData.append("opinion", self.opinion);
       auditingStepApi
       .auditingStepReject(formData)
@@ -113,7 +113,7 @@ export default {
 
     //审批流程图
     var parameters = new FormData();
-    parameters.append("invoiceId", self.businessKey);
+    parameters.append("auditingId", self.businessKey);
     auditingStepApi
     .auditingStepData(parameters)
     .then(function (response) {
@@ -127,7 +127,7 @@ export default {
 
     //对比数据
     var formData = new FormData();
-    formData.append("PBVID", self.businessKey);
+    formData.append("auditingId", self.businessKey);
     purBillVouchApi
     .compareResults(formData)
     .then(function (response) {

+ 1 - 1
src/views/base/auditing-pending.vue

@@ -93,7 +93,7 @@ export default {
     },
     handleNext(record) {
       this.modalTitle = "审核";
-      this.businessKey = record.invoiceId;
+      this.businessKey = record.id;
       this.showNext = true;
     },
     onDetailModalClose(refreshed) {

+ 65 - 0
src/views/base/contract-detail.vue

@@ -0,0 +1,65 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    width="70%"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel">
+      <el-table :data="compareResultsData" height="300" style="width: 100%" stripe>
+        <el-table-column prop="field0072" label="项目名称" width="250px"></el-table-column>
+        <el-table-column prop="field0084" label="单价"></el-table-column>
+        <el-table-column prop="field0086" label="数量"></el-table-column>
+        <el-table-column prop="field0076" label="总价"></el-table-column>
+        <el-table-column prop="state" label="状态"></el-table-column>
+      </el-table>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">关 闭</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import ContractApi from "@/api/base/contract";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      showDialog: true,
+      compareResultsData: [],
+    };
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    //子合同
+    var formData = new FormData();
+    formData.append("FormmainId", self.businessKey);
+    ContractApi
+    .childList(formData)
+    .then(function (response) {
+      var jsonData = response.data.data;
+      self.compareResultsData = jsonData;
+    })
+    .catch((error) => {
+      // self.$message.error(error + "");
+    });
+  },
+};
+</script>

+ 213 - 0
src/views/base/contract-list.vue

@@ -0,0 +1,213 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">基础信息管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/base/contract">审核合同信息</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用,必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="合同号" prop="contractCode">
+        <el-input type="text" size="mini" v-model="queryModel.contractCode"></el-input>
+      </el-form-item>
+      <el-form-item label="供应商" prop="cvenName">
+        <el-input type="text" size="mini" v-model="queryModel.cvenName"></el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column prop="field0003" label="合同号" width="180"></el-table-column>
+      <el-table-column prop="field0004" label="供应商" width="280"></el-table-column>
+      <el-table-column prop="field0087" label="合同金额" width="180"></el-table-column>
+      <el-table-column prop="checked" label="已付金额" width="180"></el-table-column>
+      <el-table-column prop="checking" label="审核金额" width="180"></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{row}">
+          <el-button size="mini" type="info" @click="handleEdit(row)">详情</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <contract-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></contract-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ContractDetail from "./contract-detail";
+import ContractApi from "@/api/base/contract";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        contractCode: "",
+        cvenName: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("contractCode", self.queryModel.contractCode);
+      formData.append("cvenName", self.queryModel.cvenName);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      ContractApi
+      .pageList(formData)
+      .then(function (response) {
+        self.loading = false;
+
+        var jsonData = response.data.data;
+
+        self.tableData = jsonData.data;
+        self.totalPages = jsonData.totalPages;
+        self.totalElements = jsonData.recordsTotal;
+      })
+      .catch((error) => {
+        self.loading = false;
+        // self.$message.error(error + "");
+      });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleEdit(record) {
+      this.modalTitle = "详情";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "contract-detail": ContractDetail,
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

+ 1 - 1
src/views/base/dataComparison-main.vue

@@ -102,7 +102,7 @@
       </ul>
       <div class="bxo">
         <div class="flptit">审批流程图</div>
-        <div class="second1" style="margin-left: 30px">
+        <div class="second1" style="margin-left: 30px; padding-top: 30px">
           <el-steps :active="workflowStepCount" align-center>
             <el-step v-for="workflowStep in workflowStepData" :key="workflowStep.value" :title="workflowStep.userName"></el-step>
           </el-steps>

+ 0 - 2
src/views/layout/index.vue

@@ -229,8 +229,6 @@ export default {
     menuApi
       .getMenuTree()
       .then(response => {
-        console.log(response);
-
         var jsonData = response.data;
 
         this.menuList = jsonData.data;