请款审核查询

src/api/ManufacturingCenter/ContractApprovalQuery.js

@@ -16,7 +16,7 @@ export function initBuyer() {
   })
 }
 // 采购合同查询
-export function searchTable1(check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) {
+export function searchTable1(radio, check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) {
   return request({
     url: '',
     method: 'post',
@@ -25,7 +25,7 @@ export function searchTable1(check1, supplier, check2, start, end, check3, name,
       ModularID: router.currentRoute.path,
       type: '1',
       name: '采购管理_合同审核查询_查询数据',
-      param: '供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name,
+      param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name,
       Pagination: pageCurrent + '&' + pageSize
     }
   })

src/api/ManufacturingCenter/RequestApprovalQuery.js

@@ -2,8 +2,8 @@ import request from '@/utils/request'
 import state from '@/store'
 import router from '@/router'
 
-// 查询审核/审批/付款
+// 初始化采购员
-export function initApproval(pageCurrent, pageSize, haha) {
+export function initBuyer() {
   return request({
     url: '',
     method: 'post',
@@ -11,28 +11,27 @@ export function initApproval(pageCurrent, pageSize, haha) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '采购管理_采购合同_审批付款_查询数据',
+      name: '人事档案管理_人员与角色_查询数据_采购员'
-      param: `审批_付款状态=${haha}`,
+    }
+  })
+}
+// 采购合同查询
+export function searchTable1(radio, check1, supplier, check2, start, end, check3, name, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '采购管理_情况审核查询_查询数据',
+      param: '查询全部=' + radio + '&供应商名称_check=' + check1 + '&供应商名称=' + supplier + '&时间段_check=' + check2 + '&开始时间=' + start + '&结束时间=' + end + '&人员编号_check=' + check3 + '&人员编号=' + name,
       Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
-// 执行审核/审批/付款
+// 采购合同明细查询
-export function execApproval(num1, num2, reason, person, haha) {
+export function searchTable2(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '采购管理_采购合同_审批付款_修改数据',
-      param: `采购合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
-    }
-  })
-}
-// 查询离线合同审核/审批/付款
-export function initApprovalOffline(pageCurrent, pageSize, haha) {
   return request({
     url: '',
     method: 'post',
@@ -40,79 +39,8 @@ export function initApprovalOffline(pageCurrent, pageSize, haha) {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
       type: '1',
-      name: '采购管理_离线合同_审批付款_查询数据',
+      name: '采购管理_采购合同内容_查询数据',
-      param: `审批_付款状态=${haha}`,
+      param: '采购合同流水号=' + num
-      Pagination: pageCurrent + '&' + pageSize
-    }
-  })
-}
-// 查询离线合同请款信息明细
-export function searchRequsetFundDetail1(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '采购管理_采购合同_请款明细_查询数据',
-      param: `采购合同请款流水号=${num}`
-    }
-  })
-}
-// 查询离线合同请款信息明细
-export function searchRequsetFundDetail2(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '采购管理_离线合同_请款明细_查询数据',
-      param: `离线合同请款流水号=${num}`
-    }
-  })
-}
-// 执行审核/审批/付款（离线合同）
-export function execApprovalOffline(num1, num2, reason, person, haha) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '2',
-      name: '采购管理_离线合同_审批付款_修改数据',
-      param: `离线合同请款流水号=${num1}&审批_付款情况流水号=${num2}&未通过原因=${reason}&操作员编号=${person}&审批_付款状态=${haha}`
-    }
-  })
-}
-// 采购合同内容查询
-export function searchContactDetail(check, num1, num2) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '采购管理_采购合同内容_查询数据_合并后',
-      param: `check=${check}&采购合同流水号=${num1}&离线合同流水号=${num2}`
-    }
-  })
-}
-// 查询离线合同明细
-export function searchMateriel(num) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      UserID: state.state.user.id,
-      ModularID: router.currentRoute.path,
-      type: '1',
-      name: '采购管理_离线合同明细_查询数据',
-      param: `离线合同流水号=${num}`
     }
   })
 }

src/views/ManufacturingCenter/ContractApprovalQuery/index.vue

@@ -21,7 +21,10 @@
         range-separator="～"
         start-placeholder="开始日期"
         end-placeholder="结束日期"/>
-      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
+      <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
+      <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
     </el-card>
     <el-card style="margin-top: 5px">
       <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
@@ -101,6 +104,7 @@ import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter
 export default {
   data() {
     return {
+      radio: '1',
       billNames: '',
       person: [],
       personValue: '',
@@ -136,7 +140,7 @@ export default {
       this.billNames ? check1 = 1 : check1 = 0
       this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
       this.personValue ? check3 = 1 : check3 = 0
-      searchTable1(check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
+      searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
         console.log(response.data)
         this.loading1 = false
         this.tableData1 = response.data.rows

src/views/ManufacturingCenter/RequestApprovalQuery/index.vue

@@ -1,39 +1,88 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--<h3 style="margin-top: 0">采购合同</h3>-->
+      <el-input v-model="billNames" clearable filterable size="small" placeholder="供应商或合同编号" style="width: 200px;margin: 5px"/>
-      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 300px;" height="200px" size="mini" highlight-current-row @row-click="searchTable01">
+      <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 120px">
-        <el-table-column label="供应商" align="center" min-width="170">
+        <el-option
+          v-for="item in person"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <span style="margin-left: 0">提交时间:</span>
+      <el-date-picker
+        v-model="dateRange"
+        size="small"
+        type="daterange"
+        align="center"
+        style="width: 300px"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
+      <el-radio v-model="radio" label="1" style="margin: 0 0 0 10px">全部</el-radio>
+      <el-radio v-model="radio" label="2" style="margin: 0 0 0 10px">通过</el-radio>
+      <el-radio v-model="radio" label="3" style="margin: 0 0 0 10px">未过</el-radio>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left: 10px" @click="total1=0;pageCurrent1=1;pageSize1=50;searchTable1()">查询</el-button>
+    </el-card>
+    <el-card style="margin-top: 5px">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" border stripe style="width: 100%" height="600px" highlight-current-row @row-click="searchTable2">
+        <el-table-column label="采购合同编号" align="center" min-width="130">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="供应商" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款时间" align="center" min-width="150">
+        <el-table-column label="采购员" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.请款时间 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="请款人" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额(元)" align="center" min-width="100" prop="请款金额">
+        <el-table-column label="合同金额(元)" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ scope.row.请款金额 }}
+            {{ scope.row.合同总额 }}
           </template>
         </el-table-column>
-        <el-table-column label="审核" align="center" width="200">
+        <el-table-column label="预付款(元)" align="center" min-width="60">
           <template slot-scope="scope">
-            <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
+            {{ scope.row.预付款 }}
-            <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="规定到货时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.规定到货时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="提交时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.提交时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核时间" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审核时间 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核人" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审核人 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审核结果" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审核结果 }}
           </template>
         </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[50, 100, 150, 200]"
           :page-size="pageSize1"
           :total="total1"
           style="display:inline-block;width:50%"
@@ -42,106 +91,28 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
-    <!--<h3 style="">合同明细</h3>-->
-    <el-row>
-      <el-col :span="10">
-        <el-table :data="gridData1" :summary-method="getSummaries2" border highlight-current-row size="mini" show-summary @row-click="searchContactDetail">
-          <el-table-column min-width="150" align="center" label="合同编号">
-            <template slot-scope="scope">
-              {{ scope.row.采购合同编号 ? scope.row.采购合同编号 : scope.row.离线合同编号 }}
-            </template>
-          </el-table-column>
-          <el-table-column width="120" align="center" label="到货金额(元)" prop="到货金额">
-            <template slot-scope="scope">
-              {{ parseFloat(scope.row.到货金额).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column width="120" align="center" label="已付金额(元)" prop="已付金额">
-            <template slot-scope="scope">
-              {{ parseFloat(scope.row.已付金额).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column width="120" align="center" label="请款金额(元)" prop="请款金额">
-            <template slot-scope="scope">
-              {{ parseFloat(scope.row.请款金额).toFixed(2) }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-      <el-col :span="14">
-        <el-table :data="contractDetail2" :summary-method="getSummaries" border height="500px" size="mini" stripe show-summary>
-          <el-table-column label="物料名称" align="center" min-width="150">
-            <template slot-scope="scope">
-              {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="物料规格" align="center" min-width="260">
-            <template slot-scope="scope">
-              {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.规格 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="物料型号" align="center" width="150">
-            <template slot-scope="scope">
-              {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.零件图号 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="采购数量" align="center" width="70">
-            <template slot-scope="scope">
-              {{ scope.row.数量 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="到货数量" align="center" width="80">
-            <template slot-scope="scope">
-              {{ scope.row.合同类型 === 1 ? scope.row.已到货数量 : scope.row.到货数量 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="合计" align="center" min-width="100" prop="合计">
-            <template slot-scope="scope">
-              {{ (parseFloat(scope.row.单价||0) * parseInt(scope.row.数量||0)).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="单价" align="center" min-width="100" prop="单价">
-            <template slot-scope="scope">
-              {{ parseFloat(scope.row.单价||0).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column label="交货期要求" align="center" min-width="100" prop="交货期要求">
-            <template slot-scope="scope">
-              {{ scope.row.合同类型 === 1 ? scope.row.交货期.split(' ')[0] === '1900-01-01' ? '-' : scope.row.交货期.split(' ')[0] : scope.row.交货期要求 }}
-            </template>
-          </el-table-column>
-          <el-table-column label="备注" align="center" min-width="150" prop="备注">
-            <template slot-scope="scope">
-              {{ scope.row.备注 }}
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
   </div>
 </template>
 
 <script>
-// import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/PurchasingCenter/FundApproval'
+import { initBuyer, searchTable1, searchTable2 } from '@/api/ManufacturingCenter/RequestApprovalQuery'
-import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/ManufacturingCenter/RequestApprovalQuery'
 import { mapGetters } from 'vuex'
 
 export default {
   data() {
     return {
-      录入工时: '',
+      radio: '1',
-      contractDetail1: '',
+      billNames: '',
-      contractDetail2: [],
+      person: [],
-      tableData1: [],
+      personValue: '',
-      pageSize1: 10,
+      dateRange: '',
-      pageCurrent1: 1,
       total1: 0,
-      tableData2: [],
+      pageCurrent1: 1,
-      pageSize2: 10,
+      pageSize1: 50,
-      pageCurrent2: 1,
+      tableData1: [],
-      total2: 0,
+      loading1: false,
-      gridData1: [],
+      dialogFormVisible: false,
-      gridData2: []
+      returns: ''
     }
   },
   computed: {
@@ -154,143 +125,47 @@ export default {
   },
   created() {
     this.fetchData()
+    this.searchTable1()
   },
   methods: {
-    searchContactDetail(row) {
-      var check
-      row.采购合同流水号 ? check = 1 : check = 2
-      searchContactDetail(check, row.采购合同流水号, row.离线合同流水号).then(response => {
-        this.contractDetail2 = response.data
-      })
-    },
-    searchOfflineContactDetail(row) { // 查询离线合同明细
-      searchMateriel(row.离线合同流水号).then(response => {
-        this.contractDetail2 = response.data
-      })
-    },
     fetchData() {
-      this.searchTable1()
+      this.person = []
-      // this.searchTable2()
+      initBuyer().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.person.push({
+            label: response.data[i].姓名,
+            value: response.data[i].人员编号
+          })
+        }
+      })
     },
     searchTable1() {
-      this.tableData1 = []
+      this.loading1 = true
-      this.gridData1 = []
+      var check1, check2, check3
-      this.contractDetail2 = []
+      this.billNames ? check1 = 1 : check1 = 0
-      initApproval(this.pageCurrent1, this.pageSize1, 0).then(response => {
+      this.dateRange ? check2 = 1 : (check2 = 0, this.dateRange = '')
+      this.personValue ? check3 = 1 : check3 = 0
+      searchTable1(this.radio, check1, this.billNames, check2, this.dateRange[0], this.dateRange[1], check3, this.personValue, this.pageCurrent1, this.pageSize1).then(response => {
+        console.log(response.data)
+        this.loading1 = false
         this.tableData1 = response.data.rows
         this.total1 = response.data.total
       })
     },
+    searchTable2(row) {
+      this.contractValue = parseInt(row.采购合同流水号)
+      searchTable2(this.contractValue).then(response => {
+        this.returns = response.data[0].合同内容
+      })
+    },
     handleSizeChange1(val) {
-      this.pageSize1 = val
       this.pageCurrent1 = 1
+      this.pageSize1 = val
       this.searchTable1()
     },
     handleCurrentChange1(val) {
       this.pageCurrent1 = val
       this.searchTable1()
-    },
-    searchTable2() {
-      initApprovalOffline(this.pageCurrent2, this.pageSize2, 0).then(response => {
-        this.tableData2 = response.data.rows
-        this.total2 = response.data.total
-      })
-    },
-    handleSizeChange2(val) {
-      this.pageSize2 = val
-      this.pageCurrent2 = 1
-      this.searchTable2()
-    },
-    handleCurrentChange2(val) {
-      this.pageCurrent2 = val
-      this.searchTable2()
-    },
-    searchTable01(row) { // 查看详情（请款信息包含的合同）
-      this.gridData1 = []
-      this.contractDetail2 = []
-      searchRequsetFundDetail1(row.采购合同请款流水号).then(response => {
-        this.gridData1 = response.data
-      })
-    },
-    searchTable02(row) { // 查看详情（请款信息包含的合同）
-      searchRequsetFundDetail2(row.离线合同请款流水号).then(response => {
-        this.gridData2 = response.data
-      })
-    },
-    yesApproval(row) { // 通过审核
-      this.$confirm('确定审核通过?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        execApproval(row.采购合同请款流水号, 1, '通过', this.id, 0).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('执行成功')
-            this.searchTable1()
-          } else { this.$message.error('执行失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消操作'
-        })
-      })
-    },
-    noApproval(row) { // 不通过审核
-      this.$prompt('请输入不通过原因', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      }).then(({ value }) => {
-        execApproval(row.采购合同请款流水号, 2, value, this.id, 0).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('执行成功')
-            this.tableData2 = []
-            this.searchTable1()
-          } else { this.$message.error('执行失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消操作'
-        })
-      })
-    },
-    yesApprovalOffline(row) { // 通过审核
-      this.$confirm('确定审核通过?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        execApprovalOffline(row.离线合同请款流水号, 1, '通过', this.id, 0).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('执行成功')
-            this.searchTable2()
-          } else { this.$message.error('执行失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消操作'
-        })
-      })
-    },
-    noApprovalOffline(row) { // 不通过审核
-      this.$prompt('请输入不通过原因', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
-      }).then(({ value }) => {
-        execApprovalOffline(row.离线合同请款流水号, 2, value, this.id, 0).then(response => {
-          if (response.data[0].result === '1') {
-            this.$message.success('执行成功')
-            this.searchTable2()
-          } else { this.$message.error('执行失败') }
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '取消操作'
-        })
-      })
     }
   }
 }