From 19cb4dd866befb55f7714d69ba5068ca38adbd11 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 15 Mar 2019 09:08:18 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceSettlementApplication/index.vue                 | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index ea119788..3cd8fa9b 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -161,7 +161,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
-            <el-button type="danger" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)">删除</el-button>
+            <el-button :disabled="disabled" type="danger" size="mini" icon="el-icon-delete" @click="deleteTable2(scope.row)">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -304,7 +304,7 @@
         </el-table-column>
         <el-table-column label="本次到票数量" align="center" width="100">
           <template slot-scope="scope">
-            <el-input-number v-model="scope.row.本次到票数量" :min="0" :max="scope.row.已到货数量" size="mini" controls-position="right" style="width: 100%;"/>
+            <el-input-number v-model="scope.row.本次到票数量" :min="0" :max="(scope.row.已到货数量||scope.row.到货数量)-scope.row.到票数量" size="mini" controls-position="right" style="width: 100%;"/>
           </template>
         </el-table-column>
       </el-table>
@@ -326,6 +326,7 @@ export default {
   name: '', // 发票结算申请
   data() {
     return {
+      disabled: false,
       contractType: '采购合同',
       invoiceNum: '',
       total1: 0,
@@ -547,6 +548,7 @@ export default {
             if (response.data[0].result === '1') {
               this.$message.success('提交成功')
               this.searchTable1()
+              this.tableData2 = []
             } else { this.$message.error('提交失败') }
           })
         }
@@ -562,6 +564,7 @@ export default {
       this.invoiceNumber = row.发票号
       this.supplierName = row.供应商名称
       this.supplierValue = row.供应商流水号
+      Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
       searchTable2(row.发票结算申请单流水号).then(response => {
         this.tableData2 = response.data
       })

From ecb2095a7334bafdb5d5a3dc041a728ff93ace2d Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Fri, 15 Mar 2019 09:42:58 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E5=AE=A1=E6=89=B9=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InvoiceSettlementApprove.js               |  12 --
 .../InvoiceSettlementApplication/index.vue    |  35 ++---
 .../InvoiceSettlementApprove/index.vue        | 130 ++++--------------
 3 files changed, 44 insertions(+), 133 deletions(-)

diff --git a/src/api/PurchasingCenter/InvoiceSettlementApprove.js b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
index 6c8898e1..15f3e5ac 100644
--- a/src/api/PurchasingCenter/InvoiceSettlementApprove.js
+++ b/src/api/PurchasingCenter/InvoiceSettlementApprove.js
@@ -25,18 +25,6 @@ export function searchTable2(num) {
     }
   })
 }
-// 入库单明细查询
-export function searchInboundCardDetail(data1) {
-  return request({
-    url: '',
-    method: 'post',
-    data: {
-      type: '1',
-      name: '库存管理_采购入库单_入库单明细_查询数据',
-      param: '采购入库单流水号=' + data1
-    }
-  })
-}
 // 执行审批
 export function excuteApprove(...data) {
   return request({
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
index 3cd8fa9b..0503011f 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue
@@ -122,7 +122,7 @@
       <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-button type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
+      <el-button :disabled="disabled" type="primary" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="addInStoreRecord()">追加入库记录</el-button>
       <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
@@ -271,7 +271,7 @@
         </el-table-column>
       </el-table>
       <el-table ref="multipleTable" :data="tableData02" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
-        <el-table-column type="selection" align="center" width="35"/>
+        <el-table-column :selectable="selectable" type="selection" align="center" width="35"/>
         <el-table-column label="名称" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -536,14 +536,14 @@ export default {
       this.searchTable1()
     },
     submitApply(row) {
-      this.$confirm('确认提交申请吗?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (this.tableData2.length === 0) {
-          this.$message.warning('发票结算申请明细为空！')
-        } else {
+      if (this.tableData2.length === 0) {
+        this.$message.warning('发票结算申请明细为空！')
+      } else {
+        this.$confirm('确认提交申请吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
           submitApply(row.发票结算申请单流水号, this.id).then(response => {
             if (response.data[0].result === '1') {
               this.$message.success('提交成功')
@@ -551,13 +551,13 @@ export default {
               this.tableData2 = []
             } else { this.$message.error('提交失败') }
           })
-        }
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消操作'
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消操作'
+          })
         })
-      })
+      }
     },
     searchTable2(row) {
       this.applyOrderNum = row.发票结算申请单流水号
@@ -675,6 +675,9 @@ export default {
           message: '已取消操作'
         })
       })
+    },
+    selectable(row) {
+      return Number(row.本次到票数量) > 0
     }
   }
 }
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index 6b002293..64b91dec 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -42,6 +42,11 @@
             </el-form>
           </template>
         </el-table-column>
+        <el-table-column label="供应商" align="center" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.供应商名称 }}
+          </template>
+        </el-table-column>
         <el-table-column label="发票号" align="center" min-width="90">
           <template slot-scope="scope">
             {{ scope.row.发票号 }}
@@ -72,7 +77,7 @@
             {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
           </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.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
           </template>
@@ -82,7 +87,7 @@
             {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" align="center" min-width="60">
+        <el-table-column label="总经理审批" align="center" min-width="70">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
@@ -92,16 +97,6 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="70">
-          <template slot-scope="scope">
-            {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
-          <template slot-scope="scope">
-            {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
-          </template>
-        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-button :disabled="false" type="primary" size="mini" @click="excuteApprove(scope.row)">审批</el-button>
@@ -122,111 +117,43 @@
     </el-card>
 
     <el-card>
-      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">采购入库单</h4>
+      <h4 style="margin-top: 5px;display: inline-block;width: 150px;">发票结算申请单明细</h4>
       <span>发票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择发票结算申请单" readonly/>
-      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini" @row-click="searchTable3">
-        <el-table-column label="入库单号" align="center" min-width="100">
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 250px;" height="250px" size="mini">
+        <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.入库单号 }}
+            {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="入库日期" align="center" min-width="100">
+        <el-table-column label="图号或型号" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.入库日期 ? scope.row.入库日期.split(' ')[0] : '—' }}
+            {{ scope.row.采购物料型号 || scope.row.离线物料型号 || scope.row.采购零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="仓库" align="center" min-width="100">
+        <el-table-column label="规格" align="center" min-width="150">
           <template slot-scope="scope">
-            {{ scope.row.仓库 }}
+            {{ scope.row.采购物料规格 || scope.row.离线物料规格 || 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="100">
           <template slot-scope="scope">
-            {{ scope.row.合同编号 }}
+            {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
           </template>
         </el-table-column>
         <el-table-column label="合同名称" align="center" min-width="100">
           <template slot-scope="scope">
-            {{ scope.row.合同名称 }}
+            {{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="到货日期" align="center" min-width="100">
+        <el-table-column label="到票数量" align="center" width="100">
           <template slot-scope="scope">
-            {{ scope.row.到货日期 ? scope.row.到货日期.split(' ')[0] : '—' }}
-          </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">
-          <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">
-          <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">
-          <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>
-      <h4>采购入库单明细</h4>
-      <el-table :data="tableData3" border style="width: 100%;max-height: 250px;" height="250px" size="mini">
-        <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">
-          <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="130">
-          <template slot-scope="scope">
-            {{ scope.row.图号 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="数量" align="center" min-width="100" prop="数量">
-          <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="sum">
-          <template slot-scope="scope">
-            {{ scope.row.sum = scope.row.本币单价 * scope.row.数量 }}
+            {{ scope.row.到票数量 }}
           </template>
         </el-table-column>
       </el-table>
@@ -235,7 +162,7 @@
 </template>
 
 <script>
-import { searchTable1, searchTable2, searchInboundCardDetail, excuteApprove } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
+import { searchTable1, searchTable2, excuteApprove } from '@/api/PurchasingCenter/InvoiceSettlementApprove'
 import { mapGetters } from 'vuex'
 import { readFile } from '@/utils/request'
 import request from '@/utils/request'
@@ -326,17 +253,10 @@ export default {
       })
     },
     searchTable2(row) {
-      console.log(row)
       this.invoiceNumber = row.发票号
       searchTable2(row.发票结算申请单流水号).then(response => {
         this.tableData2 = response.data
       })
-    },
-    searchTable3(row) {
-      console.log(row)
-      searchInboundCardDetail(row.采购入库单流水号).then(response => {
-        this.tableData3 = response.data
-      })
     }
   }
 }

From fd6f422264ba4f5bb978eff869d6b56a2e05a89b Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 15 Mar 2019 11:15:19 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/StatusQuery.js    | 10 ++++---
 .../MachiningSequenceAdjustment/index.vue     |  2 ++
 .../ManufacturingCenter/StatusQuery/index.vue | 29 +++++++++----------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/api/ManufacturingCenter/StatusQuery.js b/src/api/ManufacturingCenter/StatusQuery.js
index f5019a57..e27efdec 100644
--- a/src/api/ManufacturingCenter/StatusQuery.js
+++ b/src/api/ManufacturingCenter/StatusQuery.js
@@ -26,8 +26,9 @@ export function searchmachine(num, check, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_机床名称_查询数据_分页',
-      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      name: 'PDM_机床名称_查询数据',
+      param: '项目流水号_check=' + check + '=int&项目流水号=' + num + '&机床类型代码_check=0=int&机床类型代码=1=int&机床流水号_check=0',
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
@@ -37,8 +38,9 @@ export function searchgroup(num, pageCurrent, pageSize) {
     method: 'post',
     data: {
       type: '1',
-      name: 'PDM_组件名称_查询数据_分页',
-      param: '机床流水号=' + num + '=int&PageCurrent=' + pageCurrent + '=int&PageSize=' + pageSize + '=int&PageCount=1=int=output&ItemCount=1=int=output'
+      name: 'PDM_组件名称_查询数据',
+      param: '机床流水号=' + num,
+      Pagination: pageCurrent + '&' + pageSize
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 6031ff66..366faa8d 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -470,6 +470,7 @@ export default {
       if (this.MachineValue !== '' && this.MachineValue !== null) {
         this.loading0 = true
         searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
+          console.log(response.data)
           this.tableData = response.data.rows
           this.total = response.data.total
           this.loading0 = false
@@ -530,6 +531,7 @@ export default {
     Jurisdiction() {
       this.count = 0
       getMachine2().then(response => {
+        console.log(response.data)
         this.gridData = response.data
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].调序权限 === '1') { this.count = this.count + 1 }
diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 47ca1a41..1f6f39b1 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -381,22 +381,22 @@ export default {
         this.dialogFormVisible2 = true
         this.check6 = 1
         searchmachine(this.entryNameValue, this.check6, this.pageCurrent1, this.pageSize1).then(response => {
-          for (let i = 0; i < response.data.result.length; i++) {
-            if (response.data.result[i].机床开始时间 !== '') {
-              response.data.result[i].机床开始时间 = response.data.result[i].机床开始时间.substr(0, 10)
+          for (let i = 0; i < response.data.total; i++) {
+            if (response.data.rows[i].机床开始时间 !== '') {
+              response.data.rows[i].机床开始时间 = response.data.rows[i].机床开始时间.substr(0, 10)
             }
-            if (response.data.result[i].机床结束时间 !== '') {
-              response.data.result[i].机床结束时间 = response.data.result[i].机床结束时间.substr(0, 10)
+            if (response.data.rows[i].机床结束时间 !== '') {
+              response.data.rows[i].机床结束时间 = response.data.rows[i].机床结束时间.substr(0, 10)
             }
-            if (response.data.result[i].工位属性 === '请选择') {
-              response.data.result[i].工位属性 = ''
+            if (response.data.rows[i].工位属性 === '请选择') {
+              response.data.rows[i].工位属性 = ''
             }
-            if (response.data.result[i].机床主管 === '请选择') {
-              response.data.result[i].机床主管 = ''
+            if (response.data.rows[i].机床主管 === '请选择') {
+              response.data.rows[i].机床主管 = ''
             }
           }
-          this.tableData6 = response.data.result
-          this.total1 = parseInt(response.data.output[0].ItemCount)
+          this.tableData6 = response.data.rows
+          this.total1 = parseInt(response.data.total)
         })
       } else {
         this.$message.warning('请先选择项目')
@@ -415,10 +415,11 @@ export default {
     },
     searchGroupList() { // 查询组号
       if (this.machineToolNumber !== '') {
+        this.tableData7 = []
         this.dialogFormVisible3 = true
         searchgroup(this.machine, this.pageCurrent2, this.pageSize2).then(response => {
-          this.tableData7 = response.data.result
-          this.total2 = parseInt(response.data.output[0].ItemCount)
+          this.tableData7 = response.data.rows
+          this.total2 = parseInt(response.data.total)
         })
       } else {
         this.$message.warning('请先选择机床')
@@ -460,7 +461,6 @@ export default {
       this.searchData()
     },
     handleSizeChange1(val) {
-      this.pageCurrent1 = 1
       this.pageSize1 = val
       this.SearchMachine()
     },
@@ -469,7 +469,6 @@ export default {
       this.SearchMachine()
     },
     handleSizeChange3(val) {
-      this.pageCurrent2 = 1
       this.pageSize2 = val
       this.searchGroupList()
     },

From 18aaa31c1e01a8db7a92f85dc5c4d9ae0356cd75 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 16 Mar 2019 09:51:14 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MachiningSequenceAdjustment.js            | 26 +++++-
 .../MachiningSequenceAdjustment/index.vue     | 82 +++++++++++--------
 2 files changed, 72 insertions(+), 36 deletions(-)

diff --git a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
index 9375414f..ad8dd709 100644
--- a/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
+++ b/src/api/ManufacturingCenter/MachiningSequenceAdjustment.js
@@ -64,7 +64,7 @@ export function getTable2(stepNumber) {
     method: 'post',
     data: {
       type: '1',
-      name: '车间生产管理工艺_零件工序_查询数据_已编制工序的全部零件及工序',
+      name: '车间生产管理工艺_零件工序_查询数据_加工顺序调整查询',
       param: '项目流水号_check=0&项目流水号=0&机床流水号_check=0&机床流水号=0&组件流水号_check=0&组件流水号=0&零件图号_check=1=string&零件图号=' + stepNumber + '=string&是否查询全部数据=1=string&单件是否外协=1&考核状态=6=int'
     }
   })
@@ -81,3 +81,27 @@ export function searchParts(stepNumber) {
     }
   })
 }
+// 跳序权限
+export function JurisdictionContro2(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_加工顺序调整_更改跳序权限',
+      param: 'MES终端号=' + num1 + '&变更类型=' + num2
+    }
+  })
+}
+// 撤出零件
+export function outParts(code) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: 2,
+      name: '车间生产管理工艺_零件撤出待加工库',
+      param: '工艺计划流水号=' + code + '&结果=11111=string=output'
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
index 366faa8d..9848e49e 100644
--- a/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
+++ b/src/views/ManufacturingCenter/MachiningSequenceAdjustment/index.vue
@@ -18,7 +18,7 @@
       <span v-if="lengths !== 0" style="color: #53A3F7;font-size: 14px"> 加工零件： {{ Parts }};加工工序： {{ gongxu }}</span>
       <span v-if="lengths === 0" style="color: #53A3F7;font-size: 14px"> 无正在加工零件</span>
       <el-badge :value="num" :max="99" class="item">
-        <el-button size="small" type="text" @click="dialogFormVisible=true;Jurisdiction()">调序权限</el-button>
+        <el-button size="small" type="text" @click="dialogFormVisible=true;Jurisdiction()">跳序权限</el-button>
       </el-badge>
     </el-card>
 
@@ -260,26 +260,11 @@
         <el-table-column label="操作" width="300" align="center">
           <template slot-scope="scope">
             <div>
-              <el-button
-                size="mini"
-                icon="el-icon-arrow-up"
-                type="primary"
-                @click="upOne(scope.row)"/>
-              <el-button
-                size="mini"
-                icon="el-icon-arrow-down"
-                type="primary"
-                @click="downOne(scope.row)"/>
-              <el-button
-                size="mini"
-                icon="el-icon-upload2"
-                type="primary"
-                @click="TOP(scope.row)"/>
-              <el-button
-                size="mini"
-                icon="el-icon-download"
-                type="primary"
-                @click="Down(scope.row)"/>
+              <el-button size="mini" icon="el-icon-arrow-up" type="primary" @click="upOne(scope.row)"/>
+              <el-button size="mini" icon="el-icon-arrow-down" type="primary" @click="downOne(scope.row)"/>
+              <el-button size="mini" icon="el-icon-upload2" type="primary" @click="TOP(scope.row)"/>
+              <el-button size="mini" icon="el-icon-download" type="primary" @click="Down(scope.row)"/>
+              <el-button size="mini" icon="el-icon-delete" type="danger" @click="outParts(scope.row)"/>
             </div>
           </template>
         </el-table-column>
@@ -312,16 +297,20 @@
         </el-table-column>
         <el-table-column property="date" label="操作" align="center">
           <template slot-scope="scope">
-            <el-button
-              v-if="scope.row.调序权限==='0'"
-              size="mini"
-              type="success"
-              @click="JurisdictionControl1(scope.row)">开启</el-button>
-            <el-button
-              v-if="scope.row.调序权限==='1'"
-              size="mini"
-              type="danger"
-              @click="JurisdictionControl2(scope.row)">关闭</el-button>
+            <el-button v-if="scope.row.调序权限==='0'" size="mini" type="success" @click="JurisdictionControl1(scope.row)">开启</el-button>
+            <el-button v-if="scope.row.调序权限==='1'" size="mini" type="danger" @click="JurisdictionControl2(scope.row)">关闭</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column property="name" label="跳序权限" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.跳序权限===1" type="success" size="small">已开放</el-tag>
+            <el-tag v-else type="info" size="small">未开放</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column property="date" label="操作" align="center">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.跳序权限===0" size="mini" type="success" @click="JurisdictionControl3(scope.row)">开启</el-button>
+            <el-button v-if="scope.row.跳序权限===1" size="mini" type="danger" @click="JurisdictionControl4(scope.row)">关闭</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -331,7 +320,7 @@
 </template>
 
 <script>
-import { searchParts, getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
+import { searchParts, getMachine, getMachine2, searchtable, getTable2, Order, JurisdictionControl, JurisdictionContro2, outParts } from '@/api/ManufacturingCenter/MachiningSequenceAdjustment'
 import { wsuri, name } from '@/utils/request'
 export default {
   data() {
@@ -470,7 +459,6 @@ export default {
       if (this.MachineValue !== '' && this.MachineValue !== null) {
         this.loading0 = true
         searchtable(this.MachineValue, this.pageCurrent, this.pageSize).then(response => {
-          console.log(response.data)
           this.tableData = response.data.rows
           this.total = response.data.total
           this.loading0 = false
@@ -531,10 +519,9 @@ export default {
     Jurisdiction() {
       this.count = 0
       getMachine2().then(response => {
-        console.log(response.data)
         this.gridData = response.data
         for (let i = 0; i < response.data.length; i++) {
-          if (response.data[i].调序权限 === '1') { this.count = this.count + 1 }
+          if (response.data[i].跳序权限 === 1) { this.count = this.count + 1 }
         }
         this.num = this.count
       })
@@ -557,6 +544,24 @@ export default {
         this.websock.send('TOBS?MES?' + data + '?MES|PartsSequentialAuthority|' + data + '|0')
       })
     },
+    JurisdictionControl3(row) {
+      this.opname = row.MES终端号
+      JurisdictionContro2(row.MES终端号, 1).then(response => {
+        this.Jurisdiction()
+        return this.opname
+      }).then(data => {
+        this.websock.send('TOBS?MES?' + data + '?MES|SkipPermission|' + data + '|1')
+      })
+    },
+    JurisdictionControl4(row) {
+      this.opname = row.MES终端号
+      JurisdictionContro2(row.MES终端号, 2).then(response => {
+        this.Jurisdiction()
+        return this.opname
+      }).then(data => {
+        this.websock.send('TOBS?MES?' + data + '?MES|SkipPermission|' + data + '|0')
+      })
+    },
     // 上移
     upOne(row) {
       Order(this.MachineValue, row.工序流水号, '上移').then(response => {
@@ -581,6 +586,13 @@ export default {
         this.searchTable()
       })
     },
+    outParts(row) {
+      outParts(row.工艺计划流水号).then(response => {
+        this.searchTable()
+      }).then(data => {
+        this.websock.send('TOBS?MES?' + data + '?MES|PartsSequentialAuthority|' + data + '|0')
+      })
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1

From 71192d6d9d410085bccb212e7444b8ad946afbe0 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 16 Mar 2019 13:52:22 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePreparationBill.js                  | 14 ++++-
 .../CreatePreparationBill/index.vue           | 22 +++++++-
 .../ProcessPlanning/index.vue                 | 55 +++----------------
 3 files changed, 40 insertions(+), 51 deletions(-)

diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js
index d27a4851..480d68fd 100644
--- a/src/api/ManufacturingCenter/CreatePreparationBill.js
+++ b/src/api/ManufacturingCenter/CreatePreparationBill.js
@@ -25,7 +25,7 @@ export function searchtable2(num1) {
     }
   })
 }
-// 更改打印状态
+// 自家备料
 export function edit(num1) {
   return request({
     url: '',
@@ -37,3 +37,15 @@ export function edit(num1) {
     }
   })
 }
+// 外购备料
+export function edit2(num1) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_备料单导出_状态更改',
+      param: '工艺计划流水号=' + num1
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index fe0d40b5..3b43f3b0 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -7,7 +7,8 @@
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
         <el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
         <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
-        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">导出完成</el-button>
+        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
+        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">外购备料</el-button>
       </el-row>
     </el-card>
 
@@ -104,7 +105,7 @@
 </template>
 
 <script>
-import { searchtable, searchtable2, edit } from '@/api/ManufacturingCenter/CreatePreparationBill'
+import { searchtable, searchtable2, edit, edit2 } from '@/api/ManufacturingCenter/CreatePreparationBill'
 import { exportExcelMethod } from './exportExcel'
 import $ from 'jquery'
 export default {
@@ -196,6 +197,23 @@ export default {
         }
       }
     },
+    edit2() {
+      if (this.tableData2.length === 0) {
+        this.$message.warning('暂无数据')
+      } else {
+        this.a = 0
+        for (let i = 0; i < this.tableData2.length; i++) {
+          edit2(this.tableData2[i].工艺计划流水号).then(response => {
+            this.a += parseInt(response.data[0].result)
+            if (this.a === this.tableData2.length) {
+              this.pageSize = 10
+              this.pageCurrent = 1
+              this.searchTable()
+            }
+          })
+        }
+      }
+    },
     downLoad(tableid) {
       if (this.tableData2.length === 0) {
         this.$message.warning('暂无数据')
diff --git a/src/views/ManufacturingCenter/ProcessPlanning/index.vue b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
index 136a33b1..4c6e958b 100644
--- a/src/views/ManufacturingCenter/ProcessPlanning/index.vue
+++ b/src/views/ManufacturingCenter/ProcessPlanning/index.vue
@@ -2,24 +2,12 @@
   <div class="app-container">
 
     <el-card>
-      <el-radio-group
-        v-model="radio"
-        size="small"
-        style="margin: 10px;"
-        @change="CraftmenValue = '';checked = false;
-                 partNumValue = '';typeValue = '';partName = '';
-                 material = '';materialName = '';spec = '';batchNum = '';
-                 searchParts()">
+      <el-radio-group v-model="radio" size="small" style="margin: 10px;" @change="CraftmenValue = '';checked = false;partNumValue = '';typeValue = '';partName = '';material = '';materialName = '';spec = '';batchNum = '';searchParts()">
         <el-radio v-model="radio" :label="1">未编制</el-radio>
         <el-radio v-model="radio" :label="2">已编制</el-radio>
       </el-radio-group>
       <span>工艺员:</span>
-      <el-select
-        v-model="CraftmenValue"
-        placeholder="工艺员"
-        size="small"
-        style="width:100px"
-        @change="clearDetail();searchParts()">
+      <el-select v-model="CraftmenValue" placeholder="工艺员" size="small" style="width:100px" @change="clearDetail();searchParts()">
         <el-option
           v-for="item in Craftmen"
           :key="item.value"
@@ -27,14 +15,7 @@
           :value="item.value"/>
       </el-select>
       <span>零件号:</span>
-      <el-select
-        v-model="partNumValue"
-        filterable
-        clearable
-        placeholder="零件号"
-        size="small"
-        @clear="clearDetail"
-        @change="searchParts();searchDetail()">
+      <el-select v-model="partNumValue" filterable clearable placeholder="零件号" size="small" @clear="clearDetail" @change="searchParts();searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
@@ -227,19 +208,8 @@
 
     <el-dialog :visible.sync="dialogMaterial" title="材质选择" center width="400px">
       <el-input v-model="input" placeholder="材质" size="small" style="width:200px"/>
-      <el-button
-        type="success"
-        size="small"
-        icon="el-icon-search"
-        style="margin: 0 0 10px 10px"
-        @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询
-      </el-button>
-      <el-table
-        :data="tableMaterial"
-        size="mini"
-        highlight-current-row
-        border
-        @row-click="selectMaterial">
+      <el-button type="success" size="small" icon="el-icon-search" style="margin: 0 0 10px 10px" @click="total=0;pageCurrent=1;pageSize=10;searchMaterial()">查询</el-button>
+      <el-table :data="tableMaterial" size="mini" highlight-current-row border @row-click="selectMaterial">
         <el-table-column align="center" label="材质名称">
           <template slot-scope="scope">
             {{ scope.row.材料 }}
@@ -452,19 +422,8 @@
       </el-form>
     </el-dialog>
 
-    <el-dialog
-      :visible.sync="dialogFormVisible3"
-      title="工艺定额人员"
-      center
-      style="min-height: 300px">
-      <el-table
-        :data="tableData3"
-        size="mini"
-        style="width: 97%;max-height: 300px"
-        height="300"
-        highlight-current-row
-        border
-        @row-click="selectPerson">
+    <el-dialog :visible.sync="dialogFormVisible3" title="工艺定额人员" center style="min-height: 300px">
+      <el-table :data="tableData3" size="mini" style="width: 97%;max-height: 300px" height="300" highlight-current-row border @row-click="selectPerson">
         <el-table-column align="center" label="考勤编号" width="150">
           <template slot-scope="scope">
             {{ scope.row.考勤编号 }}

From 43d6ebc8a048fca98fbeefd6856e67e6b9d48696 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Sat, 16 Mar 2019 14:36:10 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E5=8D=95=E5=A4=87=E6=96=99=E5=88=B0=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CreatePreparationBill.js                  |  2 +-
 .../MaterialArrivalManagement.js              | 11 ++++
 .../CreatePreparationBill/index.vue           |  2 +-
 .../MaterialArrivalManagement/index.vue       | 64 ++++++++++++++++++-
 4 files changed, 74 insertions(+), 5 deletions(-)

diff --git a/src/api/ManufacturingCenter/CreatePreparationBill.js b/src/api/ManufacturingCenter/CreatePreparationBill.js
index 480d68fd..72682aef 100644
--- a/src/api/ManufacturingCenter/CreatePreparationBill.js
+++ b/src/api/ManufacturingCenter/CreatePreparationBill.js
@@ -44,7 +44,7 @@ export function edit2(num1) {
     method: 'post',
     data: {
       type: '2',
-      name: '车间生产管理工艺_备料单导出_状态更改',
+      name: '车间生产管理工艺_备料单导出_外购备料',
       param: '工艺计划流水号=' + num1
     }
   })
diff --git a/src/api/ManufacturingCenter/MaterialArrivalManagement.js b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
index 3379898b..3bd60bb2 100644
--- a/src/api/ManufacturingCenter/MaterialArrivalManagement.js
+++ b/src/api/ManufacturingCenter/MaterialArrivalManagement.js
@@ -48,3 +48,14 @@ export function change(Number, code, num) {
     }
   })
 }
+export function change2(Number, code, num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间生产管理工艺_外购备料到货更改',
+      param: '工序流水号组=' + Number + '&工作者考勤编号=' + code + '&工艺计划流水号组=' + num
+    }
+  })
+}
diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index 3b43f3b0..b02d2c11 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -8,7 +8,7 @@
         <el-checkbox v-model="all" size="mini">查询全部</el-checkbox>
         <el-button type="primary" size="small" icon="el-icon-download" style="margin-left:10px" @click="exportTable('BL')">导出备料单</el-button>
         <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">自家备料</el-button>
-        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit()">外购备料</el-button>
+        <el-button type="primary" size="small" icon="el-icon-success" style="margin-left:10px" @click="edit2()">外购备料</el-button>
       </el-row>
     </el-card>
 
diff --git a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
index b8fce6f0..cfe45891 100644
--- a/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
+++ b/src/views/ManufacturingCenter/MaterialArrivalManagement/index.vue
@@ -5,8 +5,9 @@
         <span>零件图号:</span>
         <el-input v-model="partName" placeholder="零件图号" size="small" clearable style="width:200px"/>
         <el-button size="small" icon="el-icon-search" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">查询</el-button>
-        <el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>
-        <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">到货</el-button>
+        <!--<el-checkbox v-model="all" size="mini" @change="searchTable">查询全部</el-checkbox>-->
+        <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit()">自家备料出库</el-button>
+        <el-button :disabled="all" size="small" icon="el-icon-success" type="primary" style="margin-left: 10px" @click="edit2()">外购备料出库</el-button>
         <!--<el-button size="small" icon="el-icon-refresh" type="success" style="margin-left: 10px" @click="pageSize=10; pageCurrent=1;searchTable()">刷新</el-button>-->
       </el-row>
     </el-card>
@@ -51,12 +52,52 @@
           @current-change="handleCurrentChange"/>
       </div>
     </el-card>
+    <el-card>
+      <el-table v-loading="loading" :data="tableData" height="580" style="width: 100%;" border element-loading-text="拼命加载中" @selection-change="handleSelectionChange">
+        <el-table-column
+          type="selection"
+          width="55"
+          align="center"/>
+        <el-table-column label="到货状态" width="100" align="center">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.备料到货==='1'" type="success" size="small">已到货</el-tag>
+            <el-tag v-if="scope.row.备料到货==='0'" type="warning" size="small">未到货</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column label="零件名称" align="center" width="220px">
+          <template slot-scope="scope">
+            {{ scope.row.零件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="零件图号" align="center" width="240px">
+          <template slot-scope="scope">
+            {{ scope.row.零件图号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="备料" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.工艺要求 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="block">
+        <el-pagination
+          v-if="!loading"
+          :current-page="pageCurrent"
+          :page-sizes="[10, 20, 30, 40, 100]"
+          :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 { searchtable, searchtable2, change } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
+import { searchtable, searchtable2, change, change2 } from '@/api/ManufacturingCenter/MaterialArrivalManagement'
 export default {
   data() {
     return {
@@ -114,6 +155,8 @@ export default {
       this.arrest = val
     },
     edit() {
+      this.bianliang1 = []
+      this.bianliang2 = []
       if (this.arrest.length === 0) {
         this.$message.warning('请选择零件')
       } else {
@@ -126,6 +169,21 @@ export default {
         })
       }
     },
+    edit2() {
+      this.bianliang1 = []
+      this.bianliang2 = []
+      if (this.arrest.length === 0) {
+        this.$message.warning('请选择零件')
+      } else {
+        for (let i = 0; i < this.arrest.length; i++) {
+          this.bianliang1.push(this.arrest[i].工艺计划流水号)
+          this.bianliang2.push(this.arrest[i].工序流水号)
+        }
+        change2(this.bianliang2, '0000', this.bianliang1).then(() => {
+          this.searchTable()
+        })
+      }
+    },
     // 分页
     handleSizeChange(val) {
       this.pageCurrent = 1

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 7/8] =?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 8/8] =?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