From ce0ed5ce23b9815ddc6f9654e9b0a3e3083a68b8 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 16 Mar 2019 17:26:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchaseSituationSearch.js                |  51 +++
 .../PurchaseSituationSearch/index.vue         | 307 ++++++++++++++++++
 .../PurchaseTaskAllocate/index.vue            |  22 +-
 src/views/layout/components/AppMain.vue       |   2 +-
 src/views/layout/components/Sidebar/index.vue |   1 +
 5 files changed, 362 insertions(+), 21 deletions(-)
 create mode 100644 src/api/PurchasingCenter/PurchaseSituationSearch.js
 create mode 100644 src/views/PurchasingCenter/PurchaseSituationSearch/index.vue

diff --git a/src/api/PurchasingCenter/PurchaseSituationSearch.js b/src/api/PurchasingCenter/PurchaseSituationSearch.js
new file mode 100644
index 00000000..35f0a1f0
--- /dev/null
+++ b/src/api/PurchasingCenter/PurchaseSituationSearch.js
@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 初始化机床项目
+export function initMachineProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+// 组件查询
+export function searchgroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num
+    }
+  })
+}
+// 查询表1标准件和外购件
+export function searchTable1(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购部采购_查询物料',
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
+      Pagination: params[4] + '&' + params[5]
+    }
+  })
+}
+// 查询表1基本件
+export function searchTable2(...params) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '采购管理_采购部采购_查询物料_基本件',
+      param: `机床流水号_check=${params[0]}&机床流水号=${params[1]}&组件流水号_check=${params[2]}&组件流水号=${params[3]}`,
+      Pagination: params[4] + '&' + params[5]
+    }
+  })
+}
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
new file mode 100644
index 00000000..ab132f40
--- /dev/null
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -0,0 +1,307 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <span>机床编号:</span>
+      <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange">
+        <el-option
+          v-for="item in machineNumber"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value">
+          <div style="float: left">{{ item.label }}</div>
+          <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
+        </el-option>
+      </el-select>
+      <span>组号:</span>
+      <el-select v-model="groupNumberValue" placeholder="组号" size="small" clearable>
+        <el-option
+          v-for="item in groupNumber"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"/>
+      </el-select>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="searchTable()">查询</el-button>
+    </el-card>
+
+    <el-tabs v-model="PartType" type="border-card" @tab-click="searchTable()">
+      <el-tab-pane label="标准件和外购件" name="标准件和外购件">
+        <el-table :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe>
+          <el-table-column align="center" label="采购情况" width="80px">
+            <template slot-scope="scope">
+              <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="机床图号" width="100px">
+            <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="100px">
+            <template slot-scope="scope">
+              {{ scope.row.物料名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="型号" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.物料型号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="规格" min-width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.物料规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="技术下达数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.零件数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="采购数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="到货数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.已到货数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="供应商" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.供应商名称 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="采购合同编号" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.采购合同编号 || '—' }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            :current-page="pageCurrent1"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize1"
+            :total="total1"
+            style="margin-top:10px;display:inline-block;width:50%"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange1"
+            @current-change="handleCurrentChange1"/>
+        </div>
+      </el-tab-pane>
+      <el-tab-pane label="基本件" name="基本件">
+        <el-table :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe>
+          <el-table-column align="center" label="采购情况" width="80px">
+            <template slot-scope="scope">
+              <el-tag v-if="!scope.row.人员编号" type="primary" size="small">未分配</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
+              <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="机床图号" width="100px">
+            <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="名称" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.零件名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="图号" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.零件图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="规格" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.规格 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="材料" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.材料 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="技术下达数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.零件数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="采购数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="到货数量" width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.已到货数量 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="供应商" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.供应商名称 || '—' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="采购合同编号" min-width="100px">
+            <template slot-scope="scope">
+              {{ scope.row.采购合同编号 || '—' }}
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination
+            :current-page="pageCurrent2"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="pageSize2"
+            :total="total2"
+            style="margin-top:10px;display:inline-block;width:50%"
+            layout="total, sizes, prev, pager, next, jumper"
+            @size-change="handleSizeChange2"
+            @current-change="handleCurrentChange2"/>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { initMachineProject, searchgroup, searchTable1, searchTable2 } from '@/api/PurchasingCenter/PurchaseSituationSearch'
+import { mapGetters } from 'vuex'
+export default {
+  name: '', // 采购件采购查询
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      PartType: '标准件和外购件',
+      tableData1: [],
+      tableData2: [],
+      tableData3: [],
+      pageCurrent1: 1,
+      pageSize1: 20,
+      total1: 0,
+      pageCurrent2: 1,
+      pageSize2: 20,
+      total2: 0
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'name',
+      'id' // 人员编号
+    ])
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      initMachineProject().then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.machineNumber.push({
+            label: response.data[i].机床图号,
+            name: response.data[i].项目名称,
+            value: response.data[i].机床流水号
+          })
+        }
+      })
+    },
+    machineChange() {
+      this.groupNumberValue = ''
+      this.groupNumber = []
+      searchgroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.groupNumber.push({
+            label: response.data[i].组号,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+    },
+    searchTable() {
+      if (this.PartType === '标准件和外购件') {
+        this.pageCurrent1 = 1
+        this.pageSize1 = 20
+        this.total1 = 0
+        this.searchTable1()
+      } else if (this.PartType === '基本件') {
+        this.pageCurrent2 = 1
+        this.pageSize2 = 20
+        this.total2 = 0
+        this.searchTable2()
+      }
+    },
+    handleSizeChange1(val) {
+      this.pageSize1 = val
+      this.pageCurrent1 = 1
+      this.searchTable1()
+    },
+    handleCurrentChange1(val) {
+      this.pageCurrent1 = val
+      this.searchTable1()
+    },
+    handleSizeChange2(val) {
+      this.pageSize2 = val
+      this.pageCurrent2 = 1
+      this.searchTable2()
+    },
+    handleCurrentChange2(val) {
+      this.pageCurrent2 = val
+      this.searchTable2()
+    },
+    searchTable1() { // 查询标准件和外购件
+      let check1, check2
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      searchTable1(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent1, this.pageSize1).then(response => {
+        this.tableData1 = response.data.rows
+        this.total1 = response.data.total
+      })
+    },
+    searchTable2() { // 查询基本件
+      let check1, check2
+      this.machineNumberValue ? check1 = 1 : check1 = 0
+      this.groupNumberValue ? check2 = 1 : check2 = 0
+      searchTable2(check1, this.machineNumberValue, check2, this.groupNumberValue, this.pageCurrent2, this.pageSize2).then(response => {
+        this.tableData2 = response.data.rows
+        this.total2 = response.data.total
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .el-card{
+    margin-bottom: 15px;
+  }
+  .el-select{
+    width:200px
+  }
+  .el-input{
+    width:200px
+  }
+  span{
+    margin: 10px 0 10px 10px;
+  }
+  .el-tag{
+    margin: 0
+  }
+</style>
diff --git a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
index f4c9bae2..c464d35e 100644
--- a/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
+++ b/src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue
@@ -74,15 +74,7 @@
           <el-input v-model="materialName" placeholder="物料名称" style="width:170px" size="small" clearable/>
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table
-            v-loading=""
-            :data="tableData1"
-            size="mini"
-            style="max-height: 600px"
-            height="600px"
-            border
-            stripe
-            @selection-change="handleSelectionChange1">
+          <el-table v-loading="" :data="tableData1" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
             <el-table-column align="center" label="采购情况" min-width="80px">
               <template slot-scope="scope">
@@ -208,15 +200,7 @@
           </div>
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table
-            v-loading=""
-            :data="tableData2"
-            size="mini"
-            style="max-height: 600px"
-            height="600px"
-            border
-            stripe
-            @selection-change="handleSelectionChange2">
+          <el-table v-loading="" :data="tableData2" size="mini" style="max-height: 600px" height="600px" border stripe @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
             <el-table-column align="center" label="采购情况" min-width="80px">
               <template slot-scope="scope">
@@ -365,8 +349,6 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'sidebar',
-      'avatar',
       'name',
       'id'
     ])
diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index f4e02a5b..3d192ba5 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -24,7 +24,7 @@ export default {
 <style scoped>
 .app-main {
   /*50 = navbar  */
-  min-height: calc(100vh - 50px);
+  min-height: calc(100% - 50px);
   position: relative;
   overflow: hidden;
 }
diff --git a/src/views/layout/components/Sidebar/index.vue b/src/views/layout/components/Sidebar/index.vue
index c93ffa81..bb270775 100644
--- a/src/views/layout/components/Sidebar/index.vue
+++ b/src/views/layout/components/Sidebar/index.vue
@@ -10,6 +10,7 @@
         background-color="#304156"
         text-color="#cccccc"
         active-text-color="#409EFF"
+        style="height:calc(100% - 124px)"
       >
         <sidebar-item v-for="route in permission_routers" :key="route.name" :item="route" :base-path="route.path"/>
       </el-menu>

From 35b27f6fdfa9ad94003e77d5712d963b1b356a6e Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Sat, 16 Mar 2019 17:28:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=87=87=E8=B4=AD=E4=BB=B6=E9=87=87?=
 =?UTF-8?q?=E8=B4=AD=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/PurchasingCenter/PurchaseSituationSearch/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index ab132f40..8aa07dd5 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -267,6 +267,7 @@ export default {
       this.searchTable2()
     },
     searchTable1() { // 查询标准件和外购件
+      this.total1 = 0
       let check1, check2
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0
@@ -276,6 +277,7 @@ export default {
       })
     },
     searchTable2() { // 查询基本件
+      this.total2 = 0
       let check1, check2
       this.machineNumberValue ? check1 = 1 : check1 = 0
       this.groupNumberValue ? check2 = 1 : check2 = 0