更新

src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue

@@ -0,0 +1,173 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <!--      <span>发票号:</span>-->
+      <el-input v-model="invoiceNum" placeholder="到票号\供应商" size="small" clearable/>
+      <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+    </el-card>
+
+    <el-card>
+      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="400px" size="mini" @row-click="searchTable2">
+        <el-table-column label="供应商" prop="供应商名称" align="center" width="200" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票号" prop="发票号" align="center" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.发票号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票金额(元)" align="center" min-width="110">
+          <template slot-scope="scope">
+            {{ scope.row.发票金额 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请人" prop="申请人姓名" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.申请人姓名 ? scope.row.申请人姓名 : '未提交' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" prop="操作时间" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.操作时间 ? scope.row.操作时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请时间" prop="申请时间" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批结果" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.审批4结果 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批未过原因" align="center" width="110" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批4未过原因 ? scope.row.审批4未过原因 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="财务" align="center" min-width="60">
+          <template slot-scope="scope">
+            {{ scope.row.审批3结果 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="财务未过原因" align="center" min-width="110" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批3未过原因 ? scope.row.审批3未过原因 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备注" align="center" min-width="90" show-overflow-tooltip>
+          <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-size="pageSize1"
+          :total="total1"
+          style="display:inline-block;width:50%"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange1"
+          @current-change="handleCurrentChange1"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchSupplier, searchTable1 } from '@/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking'
+import { mapGetters } from 'vuex'
+
+export default {
+  name: '', // 发票结算申请
+  data() {
+    return {
+      invoiceNum: '',
+      total1: 0,
+      pageCurrent1: 1,
+      pageSize1: 10,
+      tableData1: []
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'sidebar',
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+    this.searchTable1()
+  },
+  methods: {
+    fetchData() {
+      this.supplier = []
+      searchSupplier().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.supplier.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
+    },
+    searchTable1() {
+      this.disabled = true
+      let check1
+      this.invoiceNum ? check1 = 1 : check1 = 0
+      searchTable1(check1, this.invoiceNum, this.pageCurrent1, this.pageSize1).then(response => {
+        this.tableData1 = response.data.rows
+        this.tableData1.map(v => {
+          this.$set(v, 'scanSrc', '')
+          return v
+        })
+        for (let i = 0; i < response.data.rows.length; i++) {
+          this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
+        }
+        this.total1 = response.data.total
+      })
+    },
+    handleSizeChange1(val) {
+      this.pageCurrent1 = 1
+      this.pageSize1 = val
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  #expandTable .el-form-item{
+    margin: 0;
+  }
+</style>
+

src/views/WorkshopProcurement/PurchaseSituationSearchMetalworking/index.vue

@@ -0,0 +1,153 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-input v-model="partDrawing" placeholder="机床号零件名称图号或型号供应商" size="small" clearable style="width:250px;"/>
+      <el-date-picker
+        v-model="daterange"
+        size="small"
+        type="daterange"
+        align="center"
+        value-format="yyyy-MM-dd"
+        format="yyyy-MM-dd"
+        range-separator="～"
+        style="width:250px;margin-left: 20px;"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"/>
+      <el-button size="small" type="primary" icon="el-icon-search" style="margin-left: 20px" plain @click="pageCurrent=1;pageSize=50;searchTable()">查询</el-button>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData" size="mini" style="max-height: 590px;width: 1370px" height="720px" border @sort-change="sortChange">
+        <el-table-column align="center" label="进程" width="80px" sortable="custom" prop="进程">
+          <template slot-scope="scope">
+            {{ scope.row.采购状态 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购合同编号" width="130px">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="机床图号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="组号" width="120px">
+          <template slot-scope="scope">
+            {{ scope.row.组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="零件名称" width="130px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.物料名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="图号或型号" width="150px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="材料或规格" width="150px">
+          <template slot-scope="scope">
+            {{ scope.row.物料规格 ? scope.row.物料规格 : scope.row.物料型号 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购时间" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.采购时间 ? scope.row.采购时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购人" width="90px">
+          <template slot-scope="scope">
+            {{ scope.row.采购员 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="采购数量" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.零件数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="到货数量" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.已到货数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="到货时间" width="80px">
+          <template slot-scope="scope">
+            {{ scope.row.到货时间 ? scope.row.到货时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="供应商" width="270px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          :current-page="pageCurrent"
+          :page-sizes="[50, 100, 200, 300]"
+          :page-size="pageSize"
+          :total="total"
+          layout="total, sizes, prev, pager, next, jumper"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"/>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { searchdata } from '@/api/WorkshopProcurement/PurchaseSituationSearchMetalworking'
+export default {
+  data() {
+    return {
+      partDrawing: '', // 零件图号
+      daterange: '', // 时间段
+      tableData: [],
+      total: 0, // 总条数
+      pageSize: 50, // 每页显示条数
+      pageCurrent: 1 // 后台获取页
+    }
+  },
+  methods: {
+    sortChange(column, prop, order) {
+      console.log(column.prop)
+      if (column.prop === '进程') {
+        this.partName = 1
+      } else {
+        this.partName = ''
+      }
+      if (column.order === 'ascending') {
+        this.order = 1
+      } else if (column.order === 'descending') { this.order = 2 } else {
+        this.order = ''
+      }
+      this.searchTable()
+    },
+    searchTable() {
+      let check1, check2
+      this.partDrawing ? check1 = 1 : check1 = 0
+      this.daterange ? check2 = 1 : (check2 = 0, this.daterange = '')
+      searchdata(check1, this.partDrawing, check2, this.daterange[0], this.daterange[1], this.partName, this.order, this.pageCurrent, this.pageSize).then(response => {
+        this.tableData = response.data.rows
+        this.total = response.data.total
+      })
+    },
+    // 分页
+    handleSizeChange(val) {
+      this.pageCurrent = 1
+      this.pageSize = val
+      this.searchTable()
+    },
+    handleCurrentChange(val) {
+      this.pageCurrent = val
+      this.searchTable()
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/WorkshopProcurement/RequestApprovalQuery2/index.vue

@@ -36,7 +36,7 @@
     </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>
-        <el-table-column label="供应商" align="center" min-width="150">
+        <el-table-column label="供应商" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -46,7 +46,7 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="请款金额(元)" align="center" min-width="60">
+        <el-table-column label="请款金额(元)" align="center" min-width="80">
           <template slot-scope="scope">
             {{ scope.row.请款金额 }}
           </template>
@@ -71,16 +71,16 @@
         <!--{{ scope.row.审核情况内容 }}-->
         <!--</template>-->
         <!--</el-table-column>-->
-        <el-table-column label="审批时间" align="center" min-width="60">
-          <template slot-scope="scope">
-            {{ scope.row.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
-          </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.审批时间 ? scope.row.审批时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
         <el-table-column label="审批结果" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.审批情况内容 }}
@@ -101,7 +101,7 @@
             {{ scope.row.付款时间 ? scope.row.付款时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="付款情况内容" align="center" min-width="60">
+        <el-table-column label="付款情况" align="center" min-width="60">
           <template slot-scope="scope">
             {{ scope.row.付款情况内容 }}
           </template>
@@ -226,6 +226,7 @@ export default {
     },
     searchTable2(row) { // 查看详情（请款信息包含的合同）
       this.gridData = []
+      this.dialogFormVisible = true
       searchRequsetFundDetail(row.采购合同请款流水号).then(response => {
         this.gridData = response.data
       })