From 6c858eb1e2a733f5f1de11d9a25f3bdb3598c855 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Wed, 29 May 2019 19:15:27 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E8=AF=B7=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PurchasingCenter/FundApproval2/index.vue  | 83 ++++++++++++++++++-
 1 file changed, 82 insertions(+), 1 deletion(-)

diff --git a/src/views/PurchasingCenter/FundApproval2/index.vue b/src/views/PurchasingCenter/FundApproval2/index.vue
index 674bdd5e..e7454513 100644
--- a/src/views/PurchasingCenter/FundApproval2/index.vue
+++ b/src/views/PurchasingCenter/FundApproval2/index.vue
@@ -118,8 +118,47 @@
       </div>
     </el-card>
     <h3 id="firstAnchor" style="margin-top: 0">采购合同</h3>
-    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/>
+    <div id="print" class="print" style="min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="contractDetail1"/><hr>
     <h3 id="secondAnchor" style="">离线合同</h3>
+    <div id="offlineContract" style="min-height:500px;margin: 0 auto;width: 800px;border:1px solid black">
+      <table v-show="contractDetail2.length > 0" class="offlineContract" cellspacing="0px" align="center" border="1 solid black" width="100%">
+        <tr>
+          <th colspan="14"><h1>离线合同</h1></th>
+        </tr>
+        <tr>
+          <td colspan="3" rowspan="2" style="text-align:center;font-size: 30px;font-weight: bold">GAOJING</td>
+          <td width="80px">合同名称</td>
+          <td id="contractName" colspan="2" style="text-align: left;"/>
+          <td width="80px">供应商</td>
+          <td id="supplier" colspan="5" style="text-align: left;"/>
+          <td id="qrCode" colspan="2" rowspan="2"/>
+        </tr>
+        <tr>
+          <td width="80px">合同编号</td>
+          <td id="contractNum" colspan="2" style="text-align: left;"/>
+          <td width="80px">采购员</td>
+          <td id="buyer" colspan="5" style="text-align: left;"/>
+        </tr>
+        <tr id="tablehead">
+          <td width="50px">序号</td>
+          <td colspan="2">名称</td>
+          <td>规格</td>
+          <td colspan="2">型号</td>
+          <td>数量</td>
+          <td colspan="2">单价</td>
+          <td colspan="2">合计</td>
+          <td>交货期</td>
+          <td colspan="2">备注</td>
+        </tr>
+        <tr>
+          <td>总计</td>
+          <td id="remark" colspan="10"/>
+          <td id="total" colspan="2" style="text-align: left;"/>
+          <td/>
+        </tr>
+      </table>
+    </div>
+    <!--
     <el-table v-loading="" :data="contractDetail2" :summary-method="getSummaries" border style="margin-top:10px;max-height: 500px;" height="500px" size="mini" show-summary>
       <el-table-column label="离线合同编号" align="center" min-width="150">
         <template slot-scope="scope">
@@ -167,12 +206,14 @@
         </template>
       </el-table-column>
     </el-table>
+    -->
   </div>
 </template>
 
 <script>
 import { initApproval, execApproval, initApprovalOffline, searchRequsetFundDetail1, searchRequsetFundDetail2, execApprovalOffline, searchContactDetail, searchMateriel } from '@/api/PurchasingCenter/FundApproval'
 import { mapGetters } from 'vuex'
+import $ from 'jquery'
 
 export default {
   name: '', // 管理审批
@@ -204,6 +245,45 @@ export default {
     this.fetchData()
   },
   methods: {
+    showOffline(row) {
+      console.log(row, 222)
+      const children = document.getElementsByClassName('tableData')
+      const parent = document.getElementsByClassName('offlineContract')[0]
+      if (children.length !== 0) {
+        for (let i = children.length - 1; i >= 0; i--) {
+          parent.removeChild(children[i])
+        }
+      }
+      const tr = []
+      let length = 0
+      this.contractDetail2.length < 15 ? length = 15 : length = this.contractDetail2.length
+      for (let i = 0; i < length; i++) {
+        tr[i] = document.createElement('tr')
+        tr[i].setAttribute('class', 'tableData')
+        tr[i].innerHTML = `<td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/><td colspan="2" style="height: 40px"/><td style="height: 40px"/><td colspan="2" style="height: 40px"/>`
+        $('#tablehead').after(tr[i])
+      }
+      let total = 0
+      for (let j = 0; j < this.contractDetail2.length; j++) {
+        document.getElementsByClassName('tableData')[j].children[0].innerHTML = j + 1
+        document.getElementsByClassName('tableData')[j].children[1].innerHTML = this.contractDetail2[j].物料名称
+        document.getElementsByClassName('tableData')[j].children[2].innerHTML = this.contractDetail2[j].物料规格
+        document.getElementsByClassName('tableData')[j].children[3].innerHTML = this.contractDetail2[j].物料型号
+        document.getElementsByClassName('tableData')[j].children[4].innerHTML = this.contractDetail2[j].数量
+        document.getElementsByClassName('tableData')[j].children[5].innerHTML = this.contractDetail2[j].单价
+        document.getElementsByClassName('tableData')[j].children[6].innerHTML = (this.contractDetail2[j].数量 * this.contractDetail2[j].单价).toFixed(2)
+        document.getElementsByClassName('tableData')[j].children[7].innerHTML = this.contractDetail2[j].交货期要求
+        document.getElementsByClassName('tableData')[j].children[8].innerHTML = this.contractDetail2[j].备注
+        total += Number(this.contractDetail2[j].数量 * this.contractDetail2[j].单价)
+      }
+      total = total.toFixed(2)
+      document.getElementById('contractNum').innerHTML = row.离线合同编号
+      document.getElementById('contractName').innerHTML = row.离线合同名称
+      document.getElementById('supplier').innerHTML = row.供应商名称
+      document.getElementById('buyer').innerHTML = row.采购员
+      document.getElementById('total').innerHTML = total
+      document.getElementById('remark').innerHTML = row.离线合同备注
+    },
     searchContactDetail(row) {
       document.documentElement.scrollTop = this.$el.querySelector('#firstAnchor').offsetTop
       searchContactDetail(row.采购合同流水号).then(response => {
@@ -214,6 +294,7 @@ export default {
       document.documentElement.scrollTop = this.$el.querySelector('#secondAnchor').offsetTop
       searchMateriel(row.离线合同流水号).then(response => {
         this.contractDetail2 = response.data
+        this.showOffline(row)
       })
     },
     getSummaries(param) { // 合计

From a598b9eea7eed0d3f5f6f95722e02a2a3ac8dc11 Mon Sep 17 00:00:00 2001
From: jiangfuzhuang <jiangfuzhuang@meswork.com>
Date: Wed, 29 May 2019 20:29:20 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=A3=85=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Assembly/AssemblyExecution.js         |  87 +++++++
 src/api/Assembly/DeliveryApplication.js       |  38 +++
 .../QualityInspectionInformationInquiry.js    |  38 +++
 .../Assembly/AssemblyExecution/index.vue      | 229 ++++++++++++++++++
 .../Assembly/DeliveryApplication/index.vue    | 110 +++++++++
 .../index.vue                                 | 110 +++++++++
 .../GroupMatching/index.vue                   |  13 +-
 7 files changed, 623 insertions(+), 2 deletions(-)
 create mode 100644 src/api/Assembly/AssemblyExecution.js
 create mode 100644 src/api/Assembly/DeliveryApplication.js
 create mode 100644 src/api/Assembly/QualityInspectionInformationInquiry.js
 create mode 100644 src/views/Assembly/AssemblyExecution/index.vue
 create mode 100644 src/views/Assembly/DeliveryApplication/index.vue
 create mode 100644 src/views/Assembly/QualityInspectionInformationInquiry/index.vue

diff --git a/src/api/Assembly/AssemblyExecution.js b/src/api/Assembly/AssemblyExecution.js
new file mode 100644
index 00000000..f7eff3e2
--- /dev/null
+++ b/src/api/Assembly/AssemblyExecution.js
@@ -0,0 +1,87 @@
+import request from '@/utils/request'
+// 初始化机床项目
+export function initProject() {
+  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
+    }
+  })
+}
+// 机床查询
+export function searchTable1(machineNumberValue, check2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_机床信息_查询数据',
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
+    }
+  })
+}
+// 组件查询
+export function searchTable2(machineNumberValue, check2, groupNumberValue, check3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间管理_基本件采购_查询数据',
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue + '&组件流水号_check=' + check3 + '&组件流水号=' + groupNumberValue
+    }
+  })
+}
+// 机床名称_机床状态_修改数据
+export function MachineToolStateUpdate(machineNumberValue, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_机床状态_修改数据',
+      param: '机床流水号=' + machineNumberValue + '&装配状态=' + check
+    }
+  })
+}
+
+// 机床名称_调试状态_修改数据
+export function DebugStatusUpdate(machineNumberValue, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_调试状态_修改数据',
+      param: '机床流水号=' + machineNumberValue + '&调试状态=' + check
+    }
+  })
+}
+
+// 组件名称_组件状态_修改数据
+export function ComponentStateUpdate(machineNumberValue, check) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_组件名称_组件状态_修改数据',
+      param: '组件流水号=' + machineNumberValue + '&组件是否完成=' + check
+    }
+  })
+}
+
diff --git a/src/api/Assembly/DeliveryApplication.js b/src/api/Assembly/DeliveryApplication.js
new file mode 100644
index 00000000..5d27c1d4
--- /dev/null
+++ b/src/api/Assembly/DeliveryApplication.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 初始化机床项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+// PDM_机床名称_发货状态_查询数据
+export function selecttable(check2, machineNumberValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_发货状态_查询数据',
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
+    }
+  })
+}
+// PDM_机床名称_发货状态_编辑数据
+export function updatestate(machineNumberValue, state) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_发货状态_编辑数据',
+      param: '机床流水号=' + machineNumberValue + '&发货状态=' + state
+    }
+  })
+}
+
diff --git a/src/api/Assembly/QualityInspectionInformationInquiry.js b/src/api/Assembly/QualityInspectionInformationInquiry.js
new file mode 100644
index 00000000..5d27c1d4
--- /dev/null
+++ b/src/api/Assembly/QualityInspectionInformationInquiry.js
@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+// 初始化机床项目
+export function initProject() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_项目名称_查询数据'
+    }
+  })
+}
+// PDM_机床名称_发货状态_查询数据
+export function selecttable(check2, machineNumberValue) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_发货状态_查询数据',
+      param: '机床流水号_check=' + check2 + '&机床流水号=' + machineNumberValue
+    }
+  })
+}
+// PDM_机床名称_发货状态_编辑数据
+export function updatestate(machineNumberValue, state) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: 'PDM_机床名称_发货状态_编辑数据',
+      param: '机床流水号=' + machineNumberValue + '&发货状态=' + state
+    }
+  })
+}
+
diff --git a/src/views/Assembly/AssemblyExecution/index.vue b/src/views/Assembly/AssemblyExecution/index.vue
new file mode 100644
index 00000000..75eda729
--- /dev/null
+++ b/src/views/Assembly/AssemblyExecution/index.vue
@@ -0,0 +1,229 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>机床编号:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange();searchTable1()">
+          <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" filterable placeholder="组号" size="small" clearable @change="searchTable2()">
+          <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="searchTable1();searchTable2()">查询</el-button>
+      </el-row>
+    </el-card>
+    <el-card>
+      <h3 style="text-align: center;">总装调试</h3>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+        <el-table-column label="项目名称" align="center">
+          <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-column label="机床名称" align="center">
+          <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-column label="操作" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small" @click="handlestart_1(scope.row)">开始装配</el-button>
+            <el-button v-else-if="scope.row.装配状态===1" type="danger" size="small" @click="handleend_1(scope.row)">结束装配</el-button>
+            <el-button v-else type="info" size="small" >装配完成</el-button>
+            <el-button v-if="scope.row.调试状态===null || scope.row.调试状态===0" type="success" size="small" @click="handlestart_2(scope.row)">开始调试</el-button>
+            <el-button v-else-if="scope.row.调试状态==1" type="danger" size="small" @click="handleend_2(scope.row)">结束调试</el-button>
+            <el-button v-else type="info" size="small" >调试完成</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card>
+      <h3 style="text-align: center;">部装</h3>
+      <el-table :data="tableData2" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="280px">
+        <el-table-column label="项目名称" align="center">
+          <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-column label="机床名称" align="center">
+          <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-column label="组件名称" align="center">
+          <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-column label="操作" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small" @click="handlestart_3(scope.row)">开始装配</el-button>
+            <el-button v-else-if="scope.row.组件是否完成===1" type="danger" size="small" @click="handleend_3(scope.row)">结束装配</el-button>
+            <el-button v-else type="info" size="small" >装配完成</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, searchgroup, searchTable1, searchTable2, MachineToolStateUpdate, DebugStatusUpdate, ComponentStateUpdate } from '@/api/Assembly/AssemblyExecution'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData1: [],
+      tableData2: []
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+  },
+  methods: {
+    initProject() {
+      initProject().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].组件流水号
+          })
+        }
+      })
+    },
+    searchTable1() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      searchTable1(this.machineNumberValue, this.check2).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data, 1111)
+      })
+    },
+    searchTable2() {
+      this.tableData2 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      if (this.groupNumberValue !== '') { this.check3 = 1 } else { this.check3 = 0 }
+      searchTable2(this.machineNumberValue, this.check2).then(response => {
+        console.log(response.data, 222)
+        this.tableData2 = response.data
+      })
+    },
+    // 总装开始装配
+    handlestart_1(row) { // 弹出单据编辑
+      console.log(row)
+      MachineToolStateUpdate(row.机床流水号, 1).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 总装结束装配
+    handleend_1(row) { // 弹出单据编辑
+      console.log(row)
+      MachineToolStateUpdate(row.机床流水号, 2).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 总装开始调试
+    handlestart_2(row) { // 弹出单据编辑
+      console.log(row)
+      DebugStatusUpdate(row.机床流水号, 1).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 总装结束调试
+    handleend_2(row) { // 弹出单据编辑
+      console.log(row)
+      DebugStatusUpdate(row.机床流水号, 2).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 部装开始装配
+    handlestart_3(row) { // 弹出单据编辑
+      console.log(row)
+      ComponentStateUpdate(row.组件流水号, 1).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    },
+    // 部装结束装配
+    handleend_3(row) { // 弹出单据编辑
+      console.log(row)
+      ComponentStateUpdate(row.组件流水号, 2).then(response => {
+        console.log(response.data)
+        this.searchTable1()
+        this.searchTable2()
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/Assembly/DeliveryApplication/index.vue b/src/views/Assembly/DeliveryApplication/index.vue
new file mode 100644
index 00000000..957016d1
--- /dev/null
+++ b/src/views/Assembly/DeliveryApplication/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>机床编号:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
+          <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>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
+        <el-table-column label="项目名称" align="center">
+          <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-column label="机床名称" align="center">
+          <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-column label="注意事项" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.注意事项 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.发货状态===null || scope.row.发货状态===0" type="success" size="small" @click="handlconfirm(scope.row)">确认发货</el-button>
+            <el-button v-else-if="scope.row.发货状态===1" type="danger" size="small">待  审批</el-button>
+            <el-button v-else type="info" size="small" >已审批</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, selecttable, updatestate } from '@/api/Assembly/DeliveryApplication'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData1: [],
+      tableData2: []
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+  },
+  methods: {
+    initProject() {
+      initProject().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].机床流水号
+          })
+        }
+      })
+    },
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      selecttable(this.check2, this.machineNumberValue).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data)
+      })
+    },
+    handlconfirm(row) {
+      updatestate(row.机床流水号, 1).then(response => {
+        this.selecttable()
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
new file mode 100644
index 00000000..f1616531
--- /dev/null
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <el-row>
+        <span>机床编号:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="selecttable()">
+          <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>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 15px" @click="selecttable">查询</el-button>
+      </el-row>
+    </el-card>
+    <el-card>
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
+        <el-table-column label="项目名称" align="center">
+          <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-column label="机床名称" align="center">
+          <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-column label="注意事项" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.注意事项 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="250px" fixed="right">
+          <template slot-scope="scope">
+            <el-button v-if="scope.row.发货状态===null || scope.row.发货状态===0" type="success" size="small" @click="handlconfirm(scope.row)">确认发货</el-button>
+            <el-button v-else-if="scope.row.发货状态===1" type="danger" size="small">待  审批</el-button>
+            <el-button v-else type="info" size="small" >已审批</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import { initProject, selecttable, updatestate } from '@/api/Assembly/QualityInspectionInformationInquiry'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      groupNumberValue: '',
+      groupNumber: [],
+      tableData1: [],
+      tableData2: []
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.initProject()
+  },
+  methods: {
+    initProject() {
+      initProject().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].机床流水号
+          })
+        }
+      })
+    },
+    selecttable() {
+      this.tableData1 = []
+      if (this.machineNumberValue !== '') { this.check2 = 1 } else { this.check2 = 0 }
+      selecttable(this.check2, this.machineNumberValue).then(response => {
+        this.tableData1 = response.data
+        console.log(response.data)
+      })
+    },
+    handlconfirm(row) {
+      updatestate(row.机床流水号, 1).then(response => {
+        this.selecttable()
+      })
+    }
+  }
+}
+
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index cab4d0d6..d0cb1f1c 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -285,6 +285,13 @@
             {{ scope.row.机床主管 }}
           </template>
         </el-table-column>
+        <el-table-column align="center" label="装配状态">
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.装配状态===null || scope.row.装配状态===0" type="success" size="small">未装配</el-tag>
+            <el-tag v-else-if="scope.row.装配状态===1" type="danger" size="small" >装配中</el-tag>
+            <el-tag v-else type="info" size="small" >装配完成</el-tag>
+          </template>
+        </el-table-column>
       </el-table>
       <div class="block" style="margin-top: 10px;">
         <el-pagination
@@ -329,9 +336,11 @@
             {{ scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="组件介绍">
+        <el-table-column align="center" label="装配状态">
           <template slot-scope="scope">
-            {{ scope.row.组件介绍 }}
+            <el-tag v-if="scope.row.组件是否完成===null || scope.row.组件是否完成===0" type="success" size="small">未装配</el-tag>
+            <el-tag v-else-if="scope.row.组件是否完成===1" type="danger" size="small" >装配中</el-tag>
+            <el-tag v-else type="info" size="small" >装配完成</el-tag>
           </template>
         </el-table-column>
       </el-table>

From ab3c50f7f7c10c59538431bec611aa00a88549c5 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Thu, 30 May 2019 09:47:21 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=B7=A5=E8=89=BA=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessQuotaEstablishment.js              | 12 ++++++
 .../ProcessQuotaEstablishment/index.vue       | 38 +++++++++++++++++--
 2 files changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
index 7a4fa413..63742b3b 100644
--- a/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
+++ b/src/api/ManufacturingCenter/ProcessQuotaEstablishment.js
@@ -1,5 +1,17 @@
 import request from '@/utils/request'
 
+// 查询零件（包含借用件）
+export function getPartnames3(num1, num2) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间生产管理工艺_零件工艺计划_编制工艺_按人员机床组号或图号查',
+      param: '工艺人员编号=' + num1 + '&机床组号或图号=' + num2
+    }
+  })
+}
 // 典艺查询<高精原有数据>
 export function searchProcess11(num) {
   return request({
diff --git a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
index 03fdcf68..c070b9fc 100644
--- a/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
+++ b/src/views/ManufacturingCenter/ProcessQuotaEstablishment/index.vue
@@ -9,16 +9,24 @@
           :label="item.label"
           :value="item.value"/>
       </el-select>
-      <span>零件号:</span>
+      <!--<span>零件号:</span>
       <el-input v-model="partNumber" clearable placeholder="零件号" size="small" style="width:200px">
         <el-button slot="append" icon="el-icon-right" @click="searchParts();partNumValue=''"/>
+      </el-input>-->
+      <span>机床-分组 或 零件号:</span>
+      <el-input v-model="machine_Group_part" clearable placeholder="例：机床号-组号 或 零件号" size="small" style="width:260px">
+        <el-button slot="append" icon="el-icon-right" @click="searchPartsByMachineGroup();partNumValue=''"/>
       </el-input>
       <el-select v-model="partNumValue" placeholder="选择零件编制工艺定额" size="small" @clear="clearDetail" @change="searchDetail()">
         <el-option
           v-for="item in partNum"
           :key="item.value"
           :label="item.label"
-          :value="item.value"/>
+          :value="item.value">
+          <b style="float: left">{{ item.label }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">-{{ item.group }}</b>
+          <b style="float: right; color: #8492a6; font-size: 13px">&nbsp;&nbsp;{{ item.machine }}</b>
+        </el-option>
       </el-select>
       <el-checkbox v-model="checked" :disabled="isShow2" size="small" style="margin:10px">是否核准</el-checkbox>
       <el-button v-show="isShow2" type="danger" icon="el-icon-edit" size="small" @click="returnEdit">在制零件工艺调整
@@ -42,7 +50,7 @@
       </div>
       <div>
         <el-row>
-          <el-col :span="4">
+          <el-col style="width:210px">
             <span>物料类型:</span>
             <el-select v-model="materielValue" size="small" style="margin-top: 20px;width:120px" placeholder="物料类型" @change="clear()">
               <el-option
@@ -543,7 +551,8 @@ import {
   singleChange,
   readyChange,
   TableAddLi1,
-  TableAddLi
+  TableAddLi,
+  getPartnames3
 } from '@/api/ManufacturingCenter/ProcessQuotaEstablishment'
 import elInput from 'element-ui/packages/input'
 import { mapGetters } from 'vuex'
@@ -554,6 +563,7 @@ export default {
   },
   data() {
     return {
+      machine_Group_part: '',
       partNumber: '',
       options: [],
       weight: '',
@@ -1073,6 +1083,25 @@ export default {
         this.tableMaterial = response.data.rows
       })
     },
+    // 根据机床号-组号查询零件（包含借用件）
+    searchPartsByMachineGroup() {
+      this.tableData = []
+      this.partNum = []
+      this.disabled = false
+      this.isShow1 = true
+      this.isShow2 = false
+      this.checked1 = true
+      getPartnames3(this.CraftmenValue, this.machine_Group_part).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.partNum.push({
+            label: response.data[i].零件图号,
+            value: response.data[i].工艺计划流水号,
+            machine: response.data[i].机床图号,
+            group: response.data[i].组号
+          })
+        }
+      })
+    },
     searchParts() { // 根据条件查零件号
       this.tableData = []
       this.partNum = []
@@ -1457,6 +1486,7 @@ export default {
                   this.spec = ''
                   this.newNum = ''
                   this.searchParts()
+                  this.searchPartsByMachineGroup()
                   this.$message.success('保存成功')
                 })
               }

From 1966a1bf3f85379c5ed824e350e1e2ffaa9b65f1 Mon Sep 17 00:00:00 2001
From: chenjianan <chenjianan@meswork.com>
Date: Thu, 30 May 2019 10:03:20 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/layout/components/AppMain.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/layout/components/AppMain.vue b/src/views/layout/components/AppMain.vue
index 3d192ba5..03f99822 100644
--- a/src/views/layout/components/AppMain.vue
+++ b/src/views/layout/components/AppMain.vue
@@ -3,9 +3,9 @@
     <transition name="fade-transform" mode="out-in">
       <!-- or name="fade" -->
       <!-- <router-view :key="key"></router-view> -->
-      <!--<keep-alive>-->
-      <router-view/>
-      <!--</keep-alive>-->
+      <keep-alive>
+        <router-view/>
+      </keep-alive>
     </transition>
   </section>
 </template>