From 120c7c160192ce9a1837438e078a8e0d0f33f1bb Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Thu, 18 Jun 2020 08:26:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/Assembly/AssemblyMes.js               |  22 +
 src/api/Assembly/AssemblyTaskAssignment.js    |  17 +-
 src/api/Assembly/QualityBasicData.js          |  16 +-
 ...oiceSettlementApproveSearchMetalworking.js |  14 +
 src/views/Assembly/AssemblyMes/index.vue      | 294 ++++++---
 .../Assembly/AssemblyTaskAssignment/index.vue |  73 ++-
 .../Assembly/AssemblyWorkQuery/index.vue      | 567 ++++++++++++++++++
 src/views/Assembly/QualityBasicData/index.vue |  40 +-
 .../Inventory/CreatePickingList/index.vue     |  22 +-
 src/views/Inventory/InventoryCheck/index.vue  |   2 +-
 src/views/Inventory/MaterialOut/index.vue     |   9 +-
 src/views/Inventory/MaterialOut/index2.vue    |   7 +-
 src/views/Inventory/MaterialReturn/index.vue  |   4 +-
 src/views/Inventory/OfflinePartOut/index.vue  |   7 +-
 .../Inventory/OfflinePartsStorage/index.vue   |   8 +-
 .../Inventory/PurchaseInRecord/index.vue      |   9 +-
 .../Inventory/PurchaseOutRecord/index.vue     |   9 +-
 .../Inventory/PurchasePartsStorage/index.vue  |   5 +
 .../GroupMatching/index.vue                   |   6 +-
 .../InventoryQuery/index.vue                  |   8 +-
 .../MaterialAllocation/index.vue              |   1 -
 .../InvoiceSettlementApprove/index.vue        |  13 +-
 .../InvoiceSettlementApproveSearch/index.vue  | 109 +++-
 .../OfflinePartsQuery/index.vue               |   5 +
 .../PurchaseSituationSearch/index.vue         |  28 +-
 .../InvoiceSettlementApplication1/index.vue   |  28 +-
 .../InvoiceSettlementApprove1/index.vue       |  13 +-
 .../index.vue                                 |  64 +-
 src/views/layout/components/Navbar.vue        |   7 +-
 src/views/layout/components/TagsView.vue      |   6 +-
 30 files changed, 1217 insertions(+), 196 deletions(-)
 create mode 100644 src/views/Assembly/AssemblyWorkQuery/index.vue

diff --git a/src/api/Assembly/AssemblyMes.js b/src/api/Assembly/AssemblyMes.js
index 3cf463e0..e4abeee6 100644
--- a/src/api/Assembly/AssemblyMes.js
+++ b/src/api/Assembly/AssemblyMes.js
@@ -81,3 +81,25 @@ export function searchPeople() {
     }
   })
 }
+export function submitRework() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '2',
+      name: '车间装配管理_装配任务_返工',
+      param: '计划流水号=' + arguments[0] + '&返工原因流水号=' + arguments[1] + '&返工工时=' + arguments[2]
+    }
+  })
+}
+export function searchReworkMX(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '车间装配管理_装配任务_返工记录_查询',
+      param: '计划流水号=' + num
+    }
+  })
+}
diff --git a/src/api/Assembly/AssemblyTaskAssignment.js b/src/api/Assembly/AssemblyTaskAssignment.js
index a83599c4..ab61001b 100644
--- a/src/api/Assembly/AssemblyTaskAssignment.js
+++ b/src/api/Assembly/AssemblyTaskAssignment.js
@@ -15,6 +15,19 @@ export function initProject() {
   })
 }
 // 组件查询
+export function searchGroup(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: 'PDM_组件名称_查询数据_装配',
+      param: '机床流水号=' + num + '=int'
+    }
+  })
+}
 export function searchTable(machineNumberValue) {
   return request({
     url: '',
@@ -108,7 +121,7 @@ export function selectParts(check1, stepNumber, check2, num) {
     }
   })
 }
-export function addData(num, name, type) {
+export function addData(num, name, type, num1, num2) {
   return request({
     url: '',
     method: 'post',
@@ -117,7 +130,7 @@ export function addData(num, name, type) {
       ModularID: router.currentRoute.path,
       type: '2',
       name: '车间管理_工作计划_增加数据',
-      param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type
+      param: '机床流水号=' + num + '&任务名称=' + name + '&计划类型=' + type + '&组件流水号=' + num1 + '&组号=' + num2
     }
   })
 }
diff --git a/src/api/Assembly/QualityBasicData.js b/src/api/Assembly/QualityBasicData.js
index 1b58ab2d..482d5c93 100644
--- a/src/api/Assembly/QualityBasicData.js
+++ b/src/api/Assembly/QualityBasicData.js
@@ -108,7 +108,7 @@ export function addTest(num) {
     }
   })
 }
-// 查询 检测项明细
+// 增加 检测项明细
 export function addTesting(num, num1, num2, num3) {
   return request({
     url: '',
@@ -122,6 +122,20 @@ export function addTesting(num, num1, num2, num3) {
     }
   })
 }
+// 编辑 检测项明细
+export function editTesting(num, num1, num2, num3) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '2',
+      name: '质检管理_装配质检_检测项明细_编辑数据',
+      param: '检测项明细流水号=' + num + '&检测项明细=' + num1 + '&基准值=' + num2 + '&公差=' + num3
+    }
+  })
+}
 // 增加 不合格原因
 export function addReasons(num) {
   return request({
diff --git a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js
index 5bff03b7..4fbb66b4 100644
--- a/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js
+++ b/src/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking.js
@@ -43,3 +43,17 @@ export function cancel(...group) {
     }
   })
 }
+// 发票结算申请单明细列表
+export function searchTable2(num) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间采购管理_发票结算申请单明细_查询数据',
+      param: `发票结算申请单流水号=${num}`
+    }
+  })
+}
diff --git a/src/views/Assembly/AssemblyMes/index.vue b/src/views/Assembly/AssemblyMes/index.vue
index bd3f7b55..07b24cb6 100644
--- a/src/views/Assembly/AssemblyMes/index.vue
+++ b/src/views/Assembly/AssemblyMes/index.vue
@@ -54,7 +54,7 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button icon="el-icon-search" type="success" size="small" style="margin-left: 20px" @click="searchTable()">查询</el-button>
+          <el-button icon="el-icon-search" type="primary" size="small" plain style="margin-left: 20px" @click="searchTable()">查询</el-button>
           <span style="margin-right: 3%;float: right;margin-top: 15px;color: rgb(42,113,203)">{{ nowTime }}</span>
         </el-row>
         <el-row>
@@ -64,63 +64,69 @@
                 {{ scope.row.状态 }}
               </template>
             </el-table-column>
-            <el-table-column label="分配时间" align="center" width="110px">
+            <el-table-column label="分配时间" align="center" width="105px">
               <template slot-scope="scope">
                 {{ scope.row.分配时间 ? scope.row.分配时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
-            <el-table-column label="机床组号" align="center" width="140px">
+            <el-table-column label="机床组号" align="center" width="150px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.机床组号 }}
               </template>
             </el-table-column>
-            <el-table-column label="部件名称" align="center" width="150px">
+            <el-table-column label="部件名称" align="center" width="140px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.部件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="部件数" align="center" width="70px">
+            <el-table-column label="部件数" align="center" width="65px">
               <template slot-scope="scope">
                 {{ scope.row.部件数 }}
               </template>
             </el-table-column>
-            <el-table-column label="总数量" align="center" width="70px">
-              <template slot-scope="scope">
-                {{ scope.row.总数量 }}
-              </template>
-            </el-table-column>
-            <el-table-column label="装配工" align="center" width="210px" show-overflow-tooltip>
+            <!--<el-table-column label="总数量" align="center" width="70px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.总数量 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <el-table-column label="装配工" align="center" width="205px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.装配工 }}
               </template>
             </el-table-column>
-            <el-table-column label="开始装配" align="center" width="140px">
+            <el-table-column label="开始装配" align="center" width="120px">
               <template slot-scope="scope">
                 <template v-if="scope.row.开始时间">
                   {{ scope.row.开始时间 ? scope.row.开始时间.split(' ')[0] : '' }}
                 </template>
                 <template v-else>
-                  <el-button type="text" size="mini" icon="el-icon-setting" @click="AssemblyStart(scope.row)">开始装配</el-button>
+                  <el-button :disabled="Number(token)===16" type="text" size="mini" icon="el-icon-setting" @click="AssemblyStart(scope.row)">开始装配</el-button>
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="暂停装配" align="center" width="140px">
+            <el-table-column label="暂停装配" align="center" width="120px">
               <template slot-scope="scope">
                 <template v-if="Number(scope.row.是否暂停)===0">
-                  <el-button :disabled="Number(scope.row.是否工作) === 0 || Number(scope.row.是否工作) === 2" type="text" size="mini" icon="el-icon-map-location" @click="AssemblySuspend(scope.row)">暂停装配</el-button>
+                  <el-button :disabled="Number(scope.row.是否工作) === 0 || Number(scope.row.是否工作) === 2 || Number(token)===16" type="text" size="mini" icon="el-icon-map-location" @click="AssemblySuspend(scope.row)">暂停装配</el-button>
                 </template>
                 <template v-else>
                   <el-button type="text" size="mini" icon="" @click="AssemblyRecovery(scope.row)">恢复装配</el-button>
                 </template>
               </template>
             </el-table-column>
-            <el-table-column label="完成装配" align="center" width="140px">
+            <el-table-column label="返工" align="center" width="120px">
+              <template slot-scope="scope">
+                <el-button :disabled="Number(scope.row.是否工作) === 0 || Number(token)===16" type="text" size="mini" @click="Rework(scope.row)">返工</el-button>
+                <el-button :disabled="Number(scope.row.是否工作) === 0 || Number(token)===16" type="text" size="mini" @click="searchReworkMX(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="完成装配" align="center" width="120px">
               <template slot-scope="scope">
                 <template v-if="scope.row.结束时间">
                   {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
                 </template>
                 <template v-else>
-                  <el-button :disabled="Number(scope.row.是否工作) === 0 || Number(scope.row.是否暂停)===1" type="text" size="mini" icon="el-icon-receiving" @click="AssemblyFinish(scope.row)">完成装配</el-button>
+                  <el-button :disabled="Number(scope.row.是否工作) === 0 || Number(scope.row.是否暂停)===1 || Number(token)===16" type="text" size="mini" icon="el-icon-receiving" @click="AssemblyFinish(scope.row)">完成装配</el-button>
                 </template>
               </template>
             </el-table-column>
@@ -166,7 +172,8 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button icon="el-icon-search" type="success" size="small" style="margin-left: 20px" @click="searchTable1()">查询</el-button>
+          <el-button icon="el-icon-search" type="primary" size="small" plain style="margin-left: 20px" @click="searchTable1()">查询</el-button>
+          <el-button type="warning" size="small" icon="el-icon-download" plain style="margin-left: 15px" @click="exportExcel()">导出</el-button>
         </el-row>
         <el-row>
           <el-table v-loading="loading1" :data="tableData1" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 5px" height="720px">
@@ -225,6 +232,16 @@
                 {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
               </template>
             </el-table-column>
+            <!--<el-table-column label="质检结果" align="center" width="140px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.结束时间 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column label="质检时间" align="center" width="140px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.质检时间 ? scope.row.质检时间.split(' ')[0] : '' }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
           </el-table>
         </el-row>
       </el-tab-pane>
@@ -267,11 +284,65 @@
           @click="submitRecovery">确定</el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      :visible.sync="dialogFormVisible3"
+      title="返工"
+      center
+      width="300px">
+      <el-form ref="form3" :model="form3" :rules="rules3" label-position="right" label-width="80px">
+        <el-form-item label="返工原因" prop="返工原因">
+          <el-input v-model="form3.返工原因" size="small" style="width: 150px;"/>
+        </el-form-item>
+        <el-form-item label="返工工时" prop="返工工时">
+          <el-input-number v-model="form3.返工工时" :precision="2" :step="1" :min="0" size="small" style="width: 150px;"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          type="warning"
+          size="small"
+          icon="el-icon-check"
+          @click="submitRework">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      :visible.sync="dialogFormVisible4"
+      title="返工详情"
+      center
+      width="600px">
+      <el-table
+        :data="tableData4"
+        stripe
+        tooltip-effect="dark"
+        style="width: 100%"
+        height="300"
+        highlight-current-row
+        border
+        size="mini">
+        <el-table-column align="center" type="index" label="序号" width="50"/>
+        <el-table-column align="center" label="返工工时" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.返工工时 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返工原因" width="120">
+          <template slot-scope="scope">
+            {{ scope.row.返工原因 }}
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="返工日期" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.返工日期 }}
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { initProject, searchTable, searchName, ComponentStateUpdate, submitSuspend, searchPeople } from '@/api/Assembly/AssemblyMes'
+import { initProject, searchTable, ComponentStateUpdate, submitSuspend, searchPeople, submitRework, searchReworkMX } from '@/api/Assembly/AssemblyMes'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -280,6 +351,8 @@ export default {
       machineNumberValue: '',
       machineNumberValue1: '',
       dialogFormVisible: false,
+      dialogFormVisible3: false,
+      dialogFormVisible4: false,
       planValue: '',
       people: [],
       startTime: '',
@@ -316,13 +389,30 @@ export default {
       rules: {
         考勤编号: [{ required: true, message: '请输入考勤编号' }]
       },
+      form3: {
+        返工原因: '',
+        返工工时: ''
+      },
+      rules3: {
+        返工原因: [{ required: true, message: '请选择返工原因' }],
+        返工工时: [{ required: true, message: '请输入返工工时' }]
+      },
       loading: false,
       loading1: false,
       tableData: [],
       tableData1: [],
+      tableData4: [],
       nowTime: ''
     }
   },
+  computed: {
+    ...mapGetters([
+      'name',
+      'token',
+      'userId',
+      'id' // 人员编号
+    ])
+  },
   mounted() {
     this.searchPeople()
     this.initProject()
@@ -333,6 +423,24 @@ export default {
     clearInterval(this.timer)
   },
   methods: {
+    exportExcel() {
+      let check, check1, check3
+      this.machineNumberValue1 ? check = 1 : check = 0
+      this.startTime1 && this.endTime1 ? check1 = 1 : check1 = 0
+      this.workerValue ? check3 = 1 : check3 = 0
+      var param = []
+      param[0] = ['机床流水号_check', check]
+      param[1] = ['机床流水号', this.machineNumberValue1]
+      param[2] = ['时间段_check', check1]
+      param[3] = ['开始时间', this.startTime1]
+      param[4] = ['结束时间', this.endTime1]
+      param[5] = ['状态_check', 0]
+      param[6] = ['状态', '']
+      param[7] = ['人员_check', check3]
+      param[8] = ['人员', this.workerValue]
+      var Data = this.CreateData('2001', '报表_车间管理_装配任务_MES_查询数据', param)
+      this.exportExcel_NPOI(Data)
+    },
     zeroFill(i) {
       if (i >= 0 && i <= 9) {
         return '0' + i
@@ -376,7 +484,7 @@ export default {
     changeTime2() {
       this.pickerOptions2 = Object.assign({}, this.pickerOptions2, {
         disabledDate: (time) => {
-          return time.getTime() <= Date.parse(this.startTime1)
+          return time.getTime() <= Date.parse(this.startTime1) - 86400000
         }
       })
     },
@@ -388,6 +496,7 @@ export default {
       })
     },
     handleClick(tab, event) {
+      console.log(this.token, 123)
       if (this.activeName === '0') {
         this.machineNumberValue = ''
         this.startTime = ''
@@ -438,29 +547,20 @@ export default {
       this.dialogFormVisible = true
       this.title = '装配开始'
       this.planValue = row.计划流水号
-      this.people = []
-      searchName(this.planValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.people.push(Number(response.data[i].考勤编号))
-        }
-      })
+      this.form.考勤编号 = this.userId
     },
     submitStart() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          if (this.people.indexOf(Number(this.form.考勤编号)) !== -1) {
-            ComponentStateUpdate(this.planValue, 1, this.form.考勤编号).then(response => {
-              if (response.data.result !== '0') {
-                this.$message.success('装配开始')
-                this.dialogFormVisible = false
-                this.searchTable()
-              } else {
-                this.$message.error('装配开始失败')
-              }
-            })
-          } else {
-            this.$message.warning('请输入正确的考勤编号')
-          }
+          ComponentStateUpdate(this.planValue, 1, this.form.考勤编号).then(response => {
+            if (response.data.result !== '0') {
+              this.$message.success('装配开始')
+              this.dialogFormVisible = false
+              this.searchTable()
+            } else {
+              this.$message.error('装配开始失败')
+            }
+          })
         } else {
           return false
         }
@@ -473,29 +573,20 @@ export default {
       this.dialogFormVisible = true
       this.title = '装配完成'
       this.planValue = row.计划流水号
-      this.people = []
-      searchName(this.planValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.people.push(Number(response.data[i].考勤编号))
-        }
-      })
+      this.form.考勤编号 = this.userId
     },
     submitFinish() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          if (this.people.indexOf(Number(this.form.考勤编号)) !== -1) {
-            ComponentStateUpdate(this.planValue, 2, this.form.考勤编号).then(response => {
-              if (response.data[0].result !== '0') {
-                this.$message.success('装配完成')
-                this.dialogFormVisible = false
-                this.searchTable()
-              } else {
-                this.$message.error('装配完成失败')
-              }
-            })
-          } else {
-            this.$message.warning('请输入正确的考勤编号')
-          }
+          ComponentStateUpdate(this.planValue, 2, this.form.考勤编号).then(response => {
+            if (response.data[0].result !== '0') {
+              this.$message.success('装配完成')
+              this.dialogFormVisible = false
+              this.searchTable()
+            } else {
+              this.$message.error('装配完成失败')
+            }
+          })
         } else {
           return false
         }
@@ -508,29 +599,20 @@ export default {
       this.dialogFormVisible = true
       this.title = '暂停装配'
       this.planValue = row.计划流水号
-      this.people = []
-      searchName(this.planValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.people.push(Number(response.data[i].考勤编号))
-        }
-      })
+      this.form.考勤编号 = this.userId
     },
     submitSuspend() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          if (this.people.indexOf(Number(this.form.考勤编号)) !== -1) {
-            submitSuspend(this.planValue, 1).then(response => {
-              if (response.data[0].result !== '0') {
-                this.$message.success('暂停成功')
-                this.dialogFormVisible = false
-                this.searchTable()
-              } else {
-                this.$message.error('暂停失败')
-              }
-            })
-          } else {
-            this.$message.warning('请输入正确的考勤编号')
-          }
+          submitSuspend(this.planValue, 1).then(response => {
+            if (response.data[0].result !== '0') {
+              this.$message.success('暂停成功')
+              this.dialogFormVisible = false
+              this.searchTable()
+            } else {
+              this.$message.error('暂停失败')
+            }
+          })
         } else {
           return false
         }
@@ -544,33 +626,55 @@ export default {
       this.title = '恢复装配'
       this.planValue = row.计划流水号
       this.people = []
-      searchName(this.planValue).then(response => {
-        for (let i = 0; i < response.data.length; i++) {
-          this.people.push(Number(response.data[i].考勤编号))
-        }
-      })
+      this.form.考勤编号 = this.userId
     },
     submitRecovery() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
-          if (this.people.indexOf(Number(this.form.考勤编号)) !== -1) {
-            submitSuspend(this.planValue, 0).then(response => {
-              if (response.data[0].result !== '0') {
-                this.$message.success('恢复成功')
-                this.dialogFormVisible = false
-                this.searchTable()
-              } else {
-                this.$message.error('恢复失败')
-              }
-            })
-          } else {
-            this.$message.warning('请输入正确的考勤编号')
-          }
+          submitSuspend(this.planValue, 0).then(response => {
+            if (response.data[0].result !== '0') {
+              this.$message.success('恢复成功')
+              this.dialogFormVisible = false
+              this.searchTable()
+            } else {
+              this.$message.error('恢复失败')
+            }
+          })
         } else {
           return false
         }
       })
     },
+    Rework(row) {
+      if (this.$refs['form3'] !== undefined) {
+        this.$refs['form3'].resetFields()
+      }
+      this.dialogFormVisible3 = true
+      this.planValue = row.计划流水号
+    },
+    submitRework() {
+      this.$refs['form3'].validate((valid) => {
+        if (valid) {
+          submitRework(this.planValue, this.form3.返工原因, this.form3.返工工时).then(response => {
+            if (response.data[0].result !== '0') {
+              this.$message.success('返工成功')
+              this.dialogFormVisible3 = false
+              this.searchTable()
+            } else {
+              this.$message.error('返工失败')
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    searchReworkMX(row) {
+      this.dialogFormVisible4 = true
+      searchReworkMX(row.计划流水号).then(response => {
+        this.tableData4 = response.data
+      })
+    },
     tableData1ClassName({ row, rowIndex }) {
       if (Number(row.是否工作) === 0) {
         return 'weizhuangpei'
diff --git a/src/views/Assembly/AssemblyTaskAssignment/index.vue b/src/views/Assembly/AssemblyTaskAssignment/index.vue
index 07cfb185..0eb9d75c 100644
--- a/src/views/Assembly/AssemblyTaskAssignment/index.vue
+++ b/src/views/Assembly/AssemblyTaskAssignment/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 91%">
+    <el-card style="width: 79%">
       <el-row style="margin-top: 10px; margin-bottom: 10px">
         <span>机床编号:</span>
         <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable()">
@@ -14,12 +14,12 @@
           </el-option>
         </el-select>
         <span>机床数量：{{ machineNum }}</span>
-        <el-button size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 300px" @click="addTaskName()">增加装配任务</el-button>
+        <el-button :disabled="!machineNumberValue" size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 200px" @click="addTaskName()">增加装配任务</el-button>
       </el-row>
     </el-card>
-    <el-card style="width: 52%; float: left">
-      <el-table v-loading="loading" :data="tableData" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px">
-        <el-table-column label="机床组号" align="center" width="120px">
+    <el-card style="width: 40%; float: left">
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="570px">
+        <el-table-column label="机床组号" align="center" width="120px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床组号 }}
           </template>
@@ -34,17 +34,12 @@
             {{ scope.row.部件数 }}
           </template>
         </el-table-column>
-        <el-table-column label="总数量" align="center" width="65px">
-          <template slot-scope="scope">
-            {{ scope.row.总数量 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="自制件" align="center" width="65px">
+        <el-table-column label="自制" align="center" width="60px">
           <template slot-scope="scope">
             {{ scope.row.自制件入库率 }}
           </template>
         </el-table-column>
-        <el-table-column label="外购件" align="center" width="65px">
+        <el-table-column label="外购" align="center" width="60px">
           <template slot-scope="scope">
             {{ scope.row.外购件入库率 }}
           </template>
@@ -54,11 +49,6 @@
             <el-button :disabled="!scope.row.组件流水号" type="text" size="mini" @click="openDialog(scope.row)">查看详情</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="装配工" align="center" width="125px" show-overflow-tooltip>
-          <template slot-scope="scope">
-            {{ scope.row.装配工 }}
-          </template>
-        </el-table-column>
         <el-table-column label="分配时间" align="center" width="85px">
           <template slot-scope="scope">
             {{ scope.row.分配时间 ? scope.row.分配时间.split(' ')[0] : '' }}
@@ -73,7 +63,7 @@
       </el-table>
     </el-card>
     <el-card style="width: 39%; float: left">
-      <el-table :data="tableData2" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="720px">
+      <el-table :data="tableData2" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="570px">
         <el-table-column label="状态" align="center" width="60px">
           <template slot-scope="scope">
             {{ scope.row.状态 }}
@@ -134,6 +124,15 @@
       center
       width="300px">
       <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
+        <el-form-item label="组号">
+          <el-select v-model="GroupNumberValue" filterable placeholder="组号" size="small" clearable @change="groupChange()">
+            <el-option
+              v-for="item in GroupNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
         <el-form-item label="任务名称" prop="任务名称">
           <el-input v-model="form.任务名称" size="small" style="width: 150px;"/>
         </el-form-item>
@@ -222,19 +221,21 @@
   </div>
 </template>
 
-<script>import { initProject, searchTable, getMachineNames, selectParts, addData, deletedata, searchPeople, submitPeople, searchTable2, searchName, submitOutPeople, deleteTask } from '@/api/Assembly/AssemblyTaskAssignment'
+<script>import { initProject, searchTable, getMachineNames, selectParts, addData, deletedata, searchPeople, submitPeople, searchTable2, searchName, submitOutPeople, deleteTask, searchGroup } from '@/api/Assembly/AssemblyTaskAssignment'
 // import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
       machineNumberValue: '',
       machineNumber: [],
+      GroupNumberValue: '',
+      GroupNumber: [],
       machineNum: '',
       dialogFormVisible: false,
       dialogFormVisible1: false,
       dialogFormVisible2: false,
       dialogFormVisible3: false,
-      groupNumberValue: '',
+      planValue: '',
       loading: false,
       tableData: [],
       tableData2: [],
@@ -338,7 +339,7 @@ export default {
       this.searchPeople()
       this.addPeople_disable = false
       this.dialogFormVisible2 = true
-      this.groupNumberValue = row.计划流水号
+      this.planValue = row.计划流水号
     },
     handleSelectionChange(val) {
       this.multipleSelection = val
@@ -356,7 +357,7 @@ export default {
         for (let i = 0; i < this.multipleSelection.length; i++) {
           this.peopleGroup.push(this.multipleSelection[i].人员编号)
         }
-        submitPeople(this.groupNumberValue, this.peopleGroup).then(response => {
+        submitPeople(this.planValue, this.peopleGroup).then(response => {
           if (response.data[0].result !== '0') {
             this.$message.success('分配成功')
             this.dialogFormVisible2 = false
@@ -372,8 +373,8 @@ export default {
     outPeople(row) {
       this.outPeople_disable = false
       this.dialogFormVisible3 = true
-      this.groupNumberValue = row.计划流水号
-      searchName(this.groupNumberValue).then(response => {
+      this.planValue = row.计划流水号
+      searchName(this.planValue).then(response => {
         this.List1 = response.data
       })
     },
@@ -389,7 +390,7 @@ export default {
         for (let i = 0; i < this.multipleSelection1.length; i++) {
           this.outPeopleGroup.push(this.multipleSelection1[i].任务分配流水号)
         }
-        submitOutPeople(this.groupNumberValue, this.outPeopleGroup).then(response => {
+        submitOutPeople(this.planValue, this.outPeopleGroup).then(response => {
           if (response.data[0].result !== '0') {
             this.$message.success('移出成功')
             this.dialogFormVisible3 = false
@@ -407,15 +408,35 @@ export default {
         this.$refs['form'].resetFields()
       }
       this.form.任务名称 = ''
+      this.groupName = ''
+      this.GroupNumber = []
+      this.GroupNumberValue = ''
+      searchGroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.GroupNumber.push({
+            label: response.data[i].组号,
+            name: response.data[i].组件名称,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
       this.addTaskName_disable = false
       this.dialogFormVisible1 = true
     },
+    groupChange() {
+      for (let i = 0; i < this.GroupNumber.length; i++) {
+        if (this.GroupNumberValue === this.GroupNumber[i].value) {
+          this.form.任务名称 = this.GroupNumber[i].name
+          this.groupName = this.GroupNumber[i].label
+        }
+      }
+    },
     submitTaskName() {
       if (this.machineNumberValue) {
         this.$refs['form'].validate((valid) => {
           if (valid) {
             this.addTaskName_disable = true
-            addData(this.machineNumberValue, this.form.任务名称, 1).then(response => {
+            addData(this.machineNumberValue, this.form.任务名称, 1, this.GroupNumberValue, this.groupName).then(response => {
               if (response.data[0].result === '1') {
                 this.$message.success('新建装配任务成功')
                 this.searchTable()
diff --git a/src/views/Assembly/AssemblyWorkQuery/index.vue b/src/views/Assembly/AssemblyWorkQuery/index.vue
new file mode 100644
index 00000000..0eb9d75c
--- /dev/null
+++ b/src/views/Assembly/AssemblyWorkQuery/index.vue
@@ -0,0 +1,567 @@
+<template>
+  <div class="app-container">
+    <el-card style="width: 79%">
+      <el-row style="margin-top: 10px; margin-bottom: 10px">
+        <span>机床编号:</span>
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="searchTable()">
+          <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>机床数量：{{ machineNum }}</span>
+        <el-button :disabled="!machineNumberValue" size="small" icon="el-icon-circle-plus-outline" type="distribution" style="margin-left: 200px" @click="addTaskName()">增加装配任务</el-button>
+      </el-row>
+    </el-card>
+    <el-card style="width: 40%; float: left">
+      <el-table v-loading="loading" :data="tableData" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="570px">
+        <el-table-column label="机床组号" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.机床组号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="部件名称" align="center" width="90px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.部件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="部件数" align="center" width="65px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.部件数 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="自制" align="center" width="60px">
+          <template slot-scope="scope">
+            {{ scope.row.自制件入库率 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="外购" align="center" width="60px">
+          <template slot-scope="scope">
+            {{ scope.row.外购件入库率 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="成组配套" align="center" width="80px">
+          <template slot-scope="scope">
+            <el-button :disabled="!scope.row.组件流水号" type="text" size="mini" @click="openDialog(scope.row)">查看详情</el-button>
+          </template>
+        </el-table-column>
+        <el-table-column label="分配时间" align="center" width="85px">
+          <template slot-scope="scope">
+            {{ scope.row.分配时间 ? scope.row.分配时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="80px">
+          <template slot-scope="scope">
+            <el-button :disabled="Number(scope.row.是否工作) !== 0" type="text" size="mini" @click="openPeople(scope.row)">分配</el-button>
+            <el-button :disabled="Number(scope.row.是否工作) !== 0" type="text" icon="el-icon-delete" size="mini" @click="deleteData(scope.row)"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-card style="width: 39%; float: left">
+      <el-table :data="tableData2" :row-class-name="tableData1ClassName" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="570px">
+        <el-table-column label="状态" align="center" width="60px">
+          <template slot-scope="scope">
+            {{ scope.row.状态 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="部件名称" align="center" width="110px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.组件名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="装配工" align="center" width="120px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.装配工 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="装配开始" align="center" width="85px">
+          <template slot-scope="scope">
+            {{ scope.row.开始时间 ? scope.row.开始时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="装配暂停" align="center" width="85px">
+          <template slot-scope="scope">
+            {{ scope.row.暂停开始时间 ? scope.row.暂停开始时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="装配结束" align="center" width="85px">
+          <template slot-scope="scope">
+            {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="80px">
+          <template slot-scope="scope">
+            <el-button :disabled="Number(scope.row.是否工作) !== 0" type="text" size="mini" @click="outPeople(scope.row)">移出</el-button>
+            <el-button :disabled="Number(scope.row.是否工作) !== 0" type="text" icon="el-icon-delete" size="mini" @click="deleteTask(scope.row)"/>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-card>
+    <el-dialog
+      v-el-drag-dialog
+      :visible.sync="dialogFormVisible"
+      title="零件完成情况"
+      width="40%">
+      <div style="margin: 10px 0 0 20px;height: 650px;overflow: auto">
+        <el-tree
+          :data="departmentData"
+          :indent="50"
+          :expand-on-click-node="false"
+          :render-content="renderContent"
+          node-key="机床流水号"
+          class="selectTree"/>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-el-drag-dialog
+      :visible.sync="dialogFormVisible1"
+      title="装配任务"
+      center
+      width="300px">
+      <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="80px">
+        <el-form-item label="组号">
+          <el-select v-model="GroupNumberValue" filterable placeholder="组号" size="small" clearable @change="groupChange()">
+            <el-option
+              v-for="item in GroupNumber"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="任务名称" prop="任务名称">
+          <el-input v-model="form.任务名称" size="small" style="width: 150px;"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          :disabled="addTaskName_disable"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitTaskName">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-el-drag-dialog
+      :visible.sync="dialogFormVisible2"
+      title="分配装配任务"
+      center
+      width="340px">
+      <el-table
+        ref="multipleTable"
+        :data="List"
+        stripe
+        tooltip-effect="dark"
+        style="width: 100%"
+        height="500"
+        highlight-current-row
+        border
+        size="mini"
+        @selection-change="handleSelectionChange">
+        <el-table-column
+          :selectable="selectable"
+          align="center"
+          type="selection"
+          width="50"/>
+        <el-table-column align="center" label="装配工" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          :disabled="addPeople_disable"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitPeople">确定</el-button>
+      </div>
+    </el-dialog>
+    <el-dialog
+      v-el-drag-dialog
+      :visible.sync="dialogFormVisible3"
+      title="移出装配工"
+      center
+      width="340px">
+      <el-table
+        ref="multipleTable"
+        :data="List1"
+        stripe
+        tooltip-effect="dark"
+        style="width: 100%"
+        highlight-current-row
+        border
+        size="mini"
+        @selection-change="handleSelectionChange1">
+        <el-table-column
+          align="center"
+          type="selection"
+          width="50"/>
+        <el-table-column align="center" label="装配工" min-width="200">
+          <template slot-scope="scope">
+            {{ scope.row.姓名 }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button
+          :disabled="outPeople_disable"
+          type="primary"
+          size="small"
+          icon="el-icon-check"
+          @click="submitOutPeople">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>import { initProject, searchTable, getMachineNames, selectParts, addData, deletedata, searchPeople, submitPeople, searchTable2, searchName, submitOutPeople, deleteTask, searchGroup } from '@/api/Assembly/AssemblyTaskAssignment'
+// import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      machineNumberValue: '',
+      machineNumber: [],
+      GroupNumberValue: '',
+      GroupNumber: [],
+      machineNum: '',
+      dialogFormVisible: false,
+      dialogFormVisible1: false,
+      dialogFormVisible2: false,
+      dialogFormVisible3: false,
+      planValue: '',
+      loading: false,
+      tableData: [],
+      tableData2: [],
+      hadFile: [],
+      option: [],
+      plan: '',
+      List: [],
+      List1: [],
+      Name: [],
+      peopleGroup: [],
+      outPeopleGroup: [],
+      multipleSelection: [],
+      multipleSelection1: [],
+      addTaskName_disable: false,
+      addPeople_disable: false,
+      outPeople_disable: false,
+      form: {
+        任务名称: ''
+      },
+      rules: {
+        任务名称: [{ required: true, message: '请填写任务名称' }]
+      },
+      departmentData: [] // 树状数据
+    }
+  },
+  created() {
+    this.searchPeople()
+  },
+  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].机床流水号
+          })
+        }
+      })
+    },
+    searchPeople() {
+      searchPeople().then(response => {
+        this.List = response.data
+      })
+    },
+    searchTable() {
+      this.loading = true
+      getMachineNames(this.machineNumberValue).then(response => {
+        this.machineNum = response.data[0].机床数量
+      })
+      searchTable2(this.machineNumberValue).then(response => {
+        this.tableData2 = response.data
+      })
+      searchTable(this.machineNumberValue).then(response => {
+        this.tableData = response.data
+      }).then(() => {
+        this.loading = false
+      })
+    },
+    renderContent(h, { node, data, store }) {
+      console.log(node, 11111)
+      if (node.data.零件类型 === 1) { // 自制
+        if (parseInt(node.data.考核状态) > 6) {
+          return (<span class='treeNotesComplate'>{node.label}</span>)
+        } else {
+          return (<span class='treeNotesUnComplate'>{node.label}</span>)
+        }
+      } else { // 外购
+        if (node.data.采购状态 === '已完成') {
+          return (<span class='treeNotesComplate'>{node.label}</span>)
+        } else {
+          return (<span class='treeNotesUnComplate'>{node.label}</span>)
+        }
+      }
+    },
+    openDialog(row) {
+      this.dialogFormVisible = true
+      this.departmentData = []
+      selectParts(1, row.组件流水号, 0, 0).then(response => {
+        for (let j = 0; j < response.data.length; j++) {
+          this.departmentData.push({
+            label: (response.data[j].零件图号 ? response.data[j].零件图号 : '无零件图号') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].规格 ? response.data[j].规格 : '') + '\xa0\xa0\xa0\xa0\xa0\xa0' + (response.data[j].投产总数量 ? response.data[j].投产总数量 : '') + '..........' + (response.data[j].零件名称 ? response.data[j].零件名称 : '无零件名称') + (response.data[j].零件类型 === 1 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0自制：' + response.data[j].考核状态名称 : (response.data[j].零件类型 === 2 ? '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0制造采购' : '\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0\xa0外购：' + response.data[j].采购状态)),
+            value: response.data[j].工艺计划流水号,
+            考核状态: response.data[j].考核状态,
+            采购状态: response.data[j].采购状态,
+            零件类型: response.data[j].零件类型
+          })
+        }
+      })
+    },
+    openPeople(row) {
+      this.Name = []
+      searchName(row.计划流水号).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.Name.push(Number(response.data[i].考勤编号))
+        }
+      })
+      this.searchPeople()
+      this.addPeople_disable = false
+      this.dialogFormVisible2 = true
+      this.planValue = row.计划流水号
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val
+    },
+    selectable(row, index) { // 控制某行是否可选
+      console.log(this.Name.indexOf(Number(row.考勤编号)))
+      return this.Name.indexOf(Number(row.考勤编号)) === -1 // 未采购&&确认物料修改
+    },
+    submitPeople() {
+      if (this.multipleSelection.length === 0) {
+        this.$message.warning('请选择装配工')
+      } else {
+        this.peopleGroup = []
+        this.addPeople_disable = true
+        for (let i = 0; i < this.multipleSelection.length; i++) {
+          this.peopleGroup.push(this.multipleSelection[i].人员编号)
+        }
+        submitPeople(this.planValue, this.peopleGroup).then(response => {
+          if (response.data[0].result !== '0') {
+            this.$message.success('分配成功')
+            this.dialogFormVisible2 = false
+            this.multipleSelection = []
+            this.searchTable()
+          } else {
+            this.$message.error('分配失败')
+            this.addPeople_disable = false
+          }
+        })
+      }
+    },
+    outPeople(row) {
+      this.outPeople_disable = false
+      this.dialogFormVisible3 = true
+      this.planValue = row.计划流水号
+      searchName(this.planValue).then(response => {
+        this.List1 = response.data
+      })
+    },
+    handleSelectionChange1(val) {
+      this.multipleSelection1 = val
+    },
+    submitOutPeople() {
+      if (this.multipleSelection1.length === 0) {
+        this.$message.warning('请选择装配工')
+      } else {
+        this.outPeopleGroup = []
+        this.outPeople_disable = true
+        for (let i = 0; i < this.multipleSelection1.length; i++) {
+          this.outPeopleGroup.push(this.multipleSelection1[i].任务分配流水号)
+        }
+        submitOutPeople(this.planValue, this.outPeopleGroup).then(response => {
+          if (response.data[0].result !== '0') {
+            this.$message.success('移出成功')
+            this.dialogFormVisible3 = false
+            this.searchTable()
+            this.multipleSelection1 = []
+          } else {
+            this.$message.error('移出失败')
+            this.outPeople_disable = false
+          }
+        })
+      }
+    },
+    addTaskName() {
+      if (this.$refs['form'] !== undefined) {
+        this.$refs['form'].resetFields()
+      }
+      this.form.任务名称 = ''
+      this.groupName = ''
+      this.GroupNumber = []
+      this.GroupNumberValue = ''
+      searchGroup(this.machineNumberValue).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.GroupNumber.push({
+            label: response.data[i].组号,
+            name: response.data[i].组件名称,
+            value: response.data[i].组件流水号
+          })
+        }
+      })
+      this.addTaskName_disable = false
+      this.dialogFormVisible1 = true
+    },
+    groupChange() {
+      for (let i = 0; i < this.GroupNumber.length; i++) {
+        if (this.GroupNumberValue === this.GroupNumber[i].value) {
+          this.form.任务名称 = this.GroupNumber[i].name
+          this.groupName = this.GroupNumber[i].label
+        }
+      }
+    },
+    submitTaskName() {
+      if (this.machineNumberValue) {
+        this.$refs['form'].validate((valid) => {
+          if (valid) {
+            this.addTaskName_disable = true
+            addData(this.machineNumberValue, this.form.任务名称, 1, this.GroupNumberValue, this.groupName).then(response => {
+              if (response.data[0].result === '1') {
+                this.$message.success('新建装配任务成功')
+                this.searchTable()
+                this.dialogFormVisible1 = false
+              } else {
+                this.$message.error('新建装配任务失败')
+                this.addTaskName_disable = false
+              }
+            })
+          } else {
+            return false
+          }
+        })
+      } else {
+        this.$message.warning('请先选择机床')
+      }
+    },
+    deleteData(row) {
+      this.$confirm('确认删除该装配任务', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deletedata(row.计划流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchTable()
+          } else { this.$message.error('删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    deleteTask(row) {
+      this.$confirm('确认删除该分配任务', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        deleteTask(row.计划流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('删除成功')
+            this.searchTable()
+          } else { this.$message.error('删除失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
+    tableData1ClassName({ row, rowIndex }) {
+      if (Number(row.是否工作) === 0 && row.分配时间) {
+        return 'weizhuangpei'
+      } else if (Number(row.是否工作) === 1 && Number(row.是否暂停) === 0) {
+        return 'zhuangpeizhong'
+      } else if (Number(row.是否工作) === 1 && Number(row.是否暂停) === 1) {
+        return 'zanting'
+      } else if (Number(row.是否工作) === 2) {
+        return 'wancheng'
+      }
+    }
+  }
+}
+
+</script>
+
+<style>
+  .el-table .cjzuwcqk_complet {
+    background: #9bd7fc !important;
+  }
+</style>
+<style lang="scss">
+  .selectTree{
+    .el-tree-node__content>.el-tree-node__expand-icon{
+      display: inline !important;
+    }
+    .el-tree-node:focus > .el-tree-node__content {
+      background-color: #ccc !important;
+    }
+  }
+  .treeNotesComplate {
+    color: black;
+    background-color: #9bd7fc !important;
+  }
+  .treeNotesUnComplate {
+    color: black;
+  }
+</style>
+<style scoped>
+  .el-form--label-left >>> .el-form-item__label {
+    text-align: right;
+  }
+  >>>.el-dialog--center .el-dialog__body {
+    text-align: initial;
+    padding: 20px 30px 20px
+  }
+  >>>.el-dialog__header {
+    padding: 20px 20px 0px;
+  }
+  >>>.el-dialog__footer {
+    padding: 0px 20px 20px;
+    /*text-align: right;*/
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+  }
+  >>>.el-form-item {
+    margin-bottom: 13px;
+  }
+</style>
+<style>
+  .weizhuangpei {
+    background: #e9c5d1 !important;
+  }
+  .zhuangpeizhong {
+    background: #E6EAEE !important;
+  }
+  .zanting {
+    background: #D8E5F6 !important;
+  }
+  .wancheng {
+    background: #c6d7b3 !important;
+  }
+</style>
diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue
index b57ef520..8efc089a 100644
--- a/src/views/Assembly/QualityBasicData/index.vue
+++ b/src/views/Assembly/QualityBasicData/index.vue
@@ -205,6 +205,11 @@
             </el-table-column>
             <el-table-column label="操作" align="center" fixed="right" width="70px">
               <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleEdit(scope.row)"/>
                 <el-button
                   size="mini"
                   type="text"
@@ -236,19 +241,20 @@
         <el-form-item v-show="title==='增加检测项'" label="检测项" prop="检测项">
           <el-input v-model="Test" size="small" style="width: 200px"/>
         </el-form-item>
-        <el-form-item v-show="title==='增加检测项明细'" label="检测项明细" prop="检测项明细">
+        <el-form-item v-show="title==='增加检测项明细' || title==='编辑检测项明细'" label="检测项明细" prop="检测项明细">
           <el-input v-model="Testing" size="small" style="width: 200px"/>
         </el-form-item>
-        <el-form-item v-show="title==='增加检测项明细'" label="基准值" prop="基准值">
+        <el-form-item v-show="title==='增加检测项明细' || title==='编辑检测项明细'" label="基准值" prop="基准值">
           <el-input-number v-model="ReferenceValue" size="small" style="width: 200px"/>
         </el-form-item>
-        <el-form-item v-show="title==='增加检测项明细'" label="公差" prop="公差">
+        <el-form-item v-show="title==='增加检测项明细' || title==='编辑检测项明细'" label="公差" prop="公差">
           <el-input v-model="tolerance" size="small" style="width: 200px"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible=false">取消</el-button>
-        <el-button :disabled="disable" type="primary" @click="submitAdd()">确定</el-button>
+        <el-button v-show="title!=='编辑检测项明细'" :disabled="disable" type="primary" @click="submitAdd()">确定</el-button>
+        <el-button v-show="title==='编辑检测项明细'" :disabled="disable" type="primary" @click="submitEdit()">确定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -256,7 +262,7 @@
 
 <script>
 import { initReasons, initHandle, initSize, initAppearance, initPosition, initTest, initTesting, addReasons, addHandle, addSize, addAppearance, addPosition,
-  addTest, addTesting, deleteReasons, deleteHandle, deleteSize, deleteAppearance, deletePosition, deleteTest, deleteTesting } from '@/api/Assembly/QualityBasicData'
+  addTest, addTesting, deleteReasons, deleteHandle, deleteSize, deleteAppearance, deletePosition, deleteTest, deleteTesting, editTesting } from '@/api/Assembly/QualityBasicData'
 
 export default {
   data() {
@@ -285,7 +291,8 @@ export default {
       PositionValue: '',
       value1: '',
       dialogFormVisible: false,
-      title: ''
+      title: '',
+      testValue: ''
     }
   },
   created() {
@@ -368,6 +375,27 @@ export default {
       this.disable = false
       this.dialogFormVisible = true
     },
+    handleEdit(row) {
+      this.title = '编辑检测项明细'
+      this.disable = false
+      this.Testing = row.检测项明细
+      this.ReferenceValue = row.基准值
+      this.tolerance = row.公差
+      this.dialogFormVisible = true
+      this.testValue = row.检测项明细流水号
+    },
+    submitEdit() {
+      this.disable = true
+      editTesting(this.testValue, this.Testing, this.ReferenceValue, this.tolerance).then(response => {
+        if (response.data[0].result === '1') {
+          this.$message.success('编辑成功')
+          this.dialogFormVisible = false
+          initTesting(this.value1).then(response => { this.tableData6 = response.data })
+        } else {
+          this.$message.error('编辑失败')
+        }
+      })
+    },
     submitAdd() {
       this.disable = true
       if (this.title === '增加不合格原因') {
diff --git a/src/views/Inventory/CreatePickingList/index.vue b/src/views/Inventory/CreatePickingList/index.vue
index ffd14e82..3a6db829 100644
--- a/src/views/Inventory/CreatePickingList/index.vue
+++ b/src/views/Inventory/CreatePickingList/index.vue
@@ -60,6 +60,11 @@
                 {{ scope.row.物料规格 || '—' }}
               </template>
             </el-table-column>
+            <el-table-column align="center" prop="计量单位" label="计量单位" width="80">
+              <template slot-scope="scope">
+                {{ scope.row.计量单位 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="总数量" min-width="70px">
               <template slot-scope="scope">
                 {{ scope.row.总数量 }}
@@ -147,6 +152,11 @@
                 {{ scope.row.物料规格 || '—' }}
               </template>
             </el-table-column>
+            <el-table-column align="center" label="计量单位" min-width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.计量单位 }}
+              </template>
+            </el-table-column>
             <el-table-column align="center" label="总数量" min-width="70px">
               <template slot-scope="scope">
                 {{ scope.row.总数量 }}
@@ -309,7 +319,7 @@
           </div>
         </el-tab-pane>
         <el-tab-pane label="离线采购件" name="离线采购件">
-          <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 823px;" height="355px" @selection-change="handleSelectionChange1">
+          <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width: 890px;" height="355px" @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable1" type="selection" align="center" width="42"/>
             <el-table-column label="物料名称" prop="物料名称" align="center" width="153" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -326,6 +336,11 @@
                 {{ scope.row.物料规格 }}
               </template>
             </el-table-column>
+            <el-table-column label="计量单位" align="center" width="80px">
+              <template slot-scope="scope">
+                {{ scope.row.计量单位 }}
+              </template>
+            </el-table-column>
             <el-table-column label="库存量" align="center" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.货位存量 }}
@@ -444,6 +459,11 @@
               {{ scope.row.规格 || '—' }}
             </template>
           </el-table-column>
+          <el-table-column label="计量单位" align="center" prop="计量单位" width="80">
+            <template slot-scope="scope">
+              {{ scope.row.计量单位 }}
+            </template>
+          </el-table-column>
           <el-table-column label="机床图号" align="center" prop="机床图号" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.机床图号 }}
diff --git a/src/views/Inventory/InventoryCheck/index.vue b/src/views/Inventory/InventoryCheck/index.vue
index eae73ef9..eb719232 100644
--- a/src/views/Inventory/InventoryCheck/index.vue
+++ b/src/views/Inventory/InventoryCheck/index.vue
@@ -24,7 +24,7 @@
           <el-button type="distribution" icon="el-icon-edit" size="small" @click="addMaterial()">新增</el-button>
         </el-row>
       </div>
-      <el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 1240px" size="mini">
+      <el-table v-loading="loading" :data="tableData1" stripe highlight-current-row border height="550px" style="width: 1040px" size="mini">
         <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
diff --git a/src/views/Inventory/MaterialOut/index.vue b/src/views/Inventory/MaterialOut/index.vue
index 8a11b55e..8c2a85ad 100644
--- a/src/views/Inventory/MaterialOut/index.vue
+++ b/src/views/Inventory/MaterialOut/index.vue
@@ -53,9 +53,9 @@
               </div>
             </el-card>
           </div>
-          <div style="width: 62%;float: left">
+          <div style="width: 67%;float: left">
             <el-card>
-              <el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1000px" size="mini" height="600" @selection-change="handleSelectionChange">
+              <el-table :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1050px" size="mini" height="600" @selection-change="handleSelectionChange">
                 <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
                 <el-table-column label="名称" show-overflow-tooltip prop="名称" align="center" width="100">
                   <template slot-scope="scope">
@@ -72,6 +72,11 @@
                     {{ scope.row.规格 || '—' }}
                   </template>
                 </el-table-column>
+                <el-table-column label="计量单位" prop="计量单位" align="center" width="80" show-overflow-tooltip>
+                  <template slot-scope="scope">
+                    {{ scope.row.计量单位 }}
+                  </template>
+                </el-table-column>
                 <el-table-column label="领用" align="center" width="50">
                   <template slot-scope="scope">
                     {{ scope.row.领用数量 }}
diff --git a/src/views/Inventory/MaterialOut/index2.vue b/src/views/Inventory/MaterialOut/index2.vue
index cea080fc..4dd688e4 100644
--- a/src/views/Inventory/MaterialOut/index2.vue
+++ b/src/views/Inventory/MaterialOut/index2.vue
@@ -5,7 +5,7 @@
       <el-button size="small" type="primary" icon="el-icon-search" style="margin: 0 0 0 10px" plain @click="searchList()">查询</el-button>
       <el-button size="small" style="margin-left: 100px" type="distribution" @click="inputPassword()">领料确认</el-button>
     </div>
-    <el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1015px" size="mini" height="600" @selection-change="handleSelectionChange">
+    <el-table v-loading="loading1" :data="pickListTable2" :row-class-name="tableRowClassName1" highlight-current-row border style="width: 1080px" size="mini" height="600" @selection-change="handleSelectionChange">
       <el-table-column align="center" type="selection" width="50"/>
       <el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
         <template slot-scope="scope">
@@ -32,6 +32,11 @@
           {{ scope.row.规格 || '—' }}
         </template>
       </el-table-column>
+      <el-table-column label="计量单位" align="center" width="80">
+        <template slot-scope="scope">
+          {{ scope.row.计量单位 }}
+        </template>
+      </el-table-column>
       <el-table-column label="领用" align="center" width="50">
         <template slot-scope="scope">
           {{ scope.row.领用数量 }}
diff --git a/src/views/Inventory/MaterialReturn/index.vue b/src/views/Inventory/MaterialReturn/index.vue
index cf3dab2d..8e429894 100644
--- a/src/views/Inventory/MaterialReturn/index.vue
+++ b/src/views/Inventory/MaterialReturn/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 1220px;margin: 0px 0px 5px 0px">
+    <el-card style="width: 1400px;margin: 0px 0px 5px 0px">
       <el-row style="margin-bottom:10px;margin-top: 10px">
         <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 180px" @change="machineChange">
           <el-option
@@ -47,7 +47,7 @@
           end-placeholder="结束时间"/>
       </el-row>
     </el-card>
-    <el-card style="width: 1220px">
+    <el-card style="width: 1400px">
       <el-table :data="tableData" border stripe size="mini" height="700">
         <el-table-column label="出库类别" align="center" width="80" show-overflow-tooltip>
           <template slot-scope="scope">
diff --git a/src/views/Inventory/OfflinePartOut/index.vue b/src/views/Inventory/OfflinePartOut/index.vue
index 4b19b05e..e933dcc4 100644
--- a/src/views/Inventory/OfflinePartOut/index.vue
+++ b/src/views/Inventory/OfflinePartOut/index.vue
@@ -13,7 +13,7 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width:63%;" height="600" @row-click="searchoutRecord">
+      <el-table v-loading="listLoading" :data="tableDataBasic" highlight-current-row size="mini" border stripe style="width:68%;" height="600" @row-click="searchoutRecord">
         <el-table-column label="序号" align="center" type="index" width="50"/>
         <el-table-column label="物料名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -30,6 +30,11 @@
             {{ scope.row.物料规格 }}
           </template>
         </el-table-column>
+        <el-table-column label="计量单位" prop="计量单位" align="center" width="80">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <!--<el-table-column label="仓库名称" prop="仓库名称" align="center" min-width="80">-->
         <!--<template slot-scope="scope">-->
         <!--{{ scope.row.仓库名称 }}-->
diff --git a/src/views/Inventory/OfflinePartsStorage/index.vue b/src/views/Inventory/OfflinePartsStorage/index.vue
index 22dc5c81..4cf9ca30 100644
--- a/src/views/Inventory/OfflinePartsStorage/index.vue
+++ b/src/views/Inventory/OfflinePartsStorage/index.vue
@@ -37,6 +37,11 @@
             {{ scope.row.规格型号 }}
           </template>
         </el-table-column>
+        <el-table-column label="计量单位" prop="计量单位" width="80px" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
@@ -282,7 +287,8 @@ export default {
           规格型号: v.物料规格 + (v.零件图号 === null ? v.物料型号 : v.零件图号),
           数量: v.数量,
           到货数量: v.到货数量,
-          本次到货数量: v.本次到货数量
+          本次到货数量: v.本次到货数量,
+          计量单位: v.计量单位
         })
         this.totallength = res.data.length
       })
diff --git a/src/views/Inventory/PurchaseInRecord/index.vue b/src/views/Inventory/PurchaseInRecord/index.vue
index d7d23768..b7f6e042 100644
--- a/src/views/Inventory/PurchaseInRecord/index.vue
+++ b/src/views/Inventory/PurchaseInRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 1220px;margin: 0px 0px 5px 0px">
+    <el-card style="width: 1300px;margin: 0px 0px 5px 0px">
       <el-row style="margin-bottom:10px;margin-top: 10px">
         <el-select v-model="machineValue" filterable placeholder="机床图号" size="small" clearable style="width: 180px" @change="machineChange">
           <el-option
@@ -55,7 +55,7 @@
           end-placeholder="结束时间"/>
       </el-row>
     </el-card>
-    <el-card style="width: 1220px">
+    <el-card style="width: 1300px">
       <el-table :data="tableData1" border stripe size="mini" style="width: 100%;" height="700">
         <el-table-column label="机床图号" prop="机床图号" align="center" width="100" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -87,6 +87,11 @@
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
+        <el-table-column label="单位" prop="计量单位" align="center" width="60" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="入库数量" align="center" width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.入库数量 }}
diff --git a/src/views/Inventory/PurchaseOutRecord/index.vue b/src/views/Inventory/PurchaseOutRecord/index.vue
index f2023bab..8d2c55f8 100644
--- a/src/views/Inventory/PurchaseOutRecord/index.vue
+++ b/src/views/Inventory/PurchaseOutRecord/index.vue
@@ -48,7 +48,7 @@
           end-placeholder="结束时间"/>
       </el-row>
     </el-card>
-    <el-card style="width: 1410px">
+    <el-card style="width: 1430px">
       <el-table :data="tableData" border stripe size="mini" style="width: 98%" height="700">
         <el-table-column label="名称" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
@@ -60,11 +60,16 @@
             {{ scope.row.图号或型号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" width="270" show-overflow-tooltip>
+        <el-table-column label="规格" align="center" width="250" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center" width="60" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="机床图号" prop="机床图号" align="center" width="220" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
diff --git a/src/views/Inventory/PurchasePartsStorage/index.vue b/src/views/Inventory/PurchasePartsStorage/index.vue
index 213d34b5..18c64367 100644
--- a/src/views/Inventory/PurchasePartsStorage/index.vue
+++ b/src/views/Inventory/PurchasePartsStorage/index.vue
@@ -40,6 +40,11 @@
             {{ scope.row.物料规格 ? scope.row.物料规格 : '-' + '&nbsp;' + scope.row.物料型号 ? scope.row.零件图号 : '-' }}
           </template>
         </el-table-column>
+        <el-table-column label="计量单位" align="center" width="80" show-overflow-tooltip prop="计量单位">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="采购数量" align="center" width="100" show-overflow-tooltip prop="数量">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 557801c0..41e02ffe 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -883,20 +883,22 @@ export default {
       })
     },
     handleSizeChange5(val) {
+      var check
       this.pageCurrent5 = 1
       this.pageSize5 = val
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
-      searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent5, this.pageSize5).then(response => {
         this.tableData1 = response.data.rows
         this.total5 = parseInt(response.data.total)
       })
     },
     handleCurrentChange5(val) {
+      var check
       this.pageCurrent5 = val
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
-      searchTable1(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
+      searchTable1(this.check1, this.Machine, this.check2, this.Group, check, this.materialName, this.order, this.pageCurrent5, this.pageSize5).then(response => {
         this.tableData1 = response.data.rows
         this.total5 = parseInt(response.data.total)
       })
diff --git a/src/views/ManufacturingCenter/InventoryQuery/index.vue b/src/views/ManufacturingCenter/InventoryQuery/index.vue
index 1b48d0e2..84f774bb 100644
--- a/src/views/ManufacturingCenter/InventoryQuery/index.vue
+++ b/src/views/ManufacturingCenter/InventoryQuery/index.vue
@@ -8,7 +8,7 @@
           <el-button v-positive="'loading'" :disabled="false" type="success" icon="el-icon-bottom" plain size="small" @click="exportExcel()">导出</el-button>
         </el-row>
       </div>
-      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 579px" size="mini">
+      <el-table :data="tableData1" stripe highlight-current-row border height="600px" style="width: 670px" size="mini">
         <el-table-column label="名称" prop="物料名称" align="center" width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 }}
@@ -48,6 +48,12 @@
             <span v-else>{{ scope.row.货位存量 }}</span>
           </template>
         </el-table-column>
+        <el-table-column label="计量单位" align="center" width="100" prop="计量单位">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
+
         <!--        <el-table-column label="操作" align="center" width="100">-->
         <!--          <template slot-scope="scope">-->
         <!--            <el-button v-if="scope.row.changeValue" type="mini" size="mini" icon="el-icon-circle-check-outline" @click="confirmEdit(scope.row)">确定</el-button>-->
diff --git a/src/views/ManufacturingCenter/MaterialAllocation/index.vue b/src/views/ManufacturingCenter/MaterialAllocation/index.vue
index d9d2a297..bba42d63 100644
--- a/src/views/ManufacturingCenter/MaterialAllocation/index.vue
+++ b/src/views/ManufacturingCenter/MaterialAllocation/index.vue
@@ -447,7 +447,6 @@ export default {
   methods: {
     clearmachineValue() {
       this.machineValue = ''
-      this.machine = []
       this.group = []
       this.groupValue = ''
     },
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
index bc85b0e4..bdb82e96 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApprove/index.vue
@@ -170,7 +170,13 @@
             {{ scope.row.到票数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="到票金额" align="center" width="100">
+          <template slot-scope="scope">
+            {{ Number(scope.row.金额).toFixed(2) }}
+          </template>
+        </el-table-column>
       </el-table>
+      <span style="margin-left: 1000px">到票总额：{{ totalMoney.toFixed(2) }}</span>
     </el-card>
   </div>
 </template>
@@ -194,7 +200,8 @@ export default {
       tableData2: [],
       tableData3: [],
       supplierValues: [],
-      supplierValue: ''
+      supplierValue: '',
+      totalMoney: 0
     }
   },
   computed: {
@@ -341,6 +348,10 @@ export default {
       this.invoiceNumber = row.发票号
       searchTable2(row.发票结算申请单流水号).then(response => {
         this.tableData2 = response.data
+        this.totalMoney = 0
+        for (let i = 0; i < response.data.length; i++) {
+          this.totalMoney += parseFloat(response.data[i].金额)
+        }
       })
     }
   }
diff --git a/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue b/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue
index 582d607a..1425ffd8 100644
--- a/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue
+++ b/src/views/PurchasingCenter/InvoiceSettlementApproveSearch/index.vue
@@ -15,7 +15,7 @@
         <el-button type="success" size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=100000;searchTable1()">查询</el-button>
       </div>
       <!--      <h4 style="margin: 0">发票结算申请单</h4>-->
-      <el-table id="expandTable" :data="tableData1" border highlight-current-row height="250px" style="width: 100%;height: 330px;overflow:auto" size="mini">
+      <el-table id="expandTable" :data="tableData1" border highlight-current-row height="250px" style="width: 100%;height: 330px;overflow:auto" size="mini" @row-click="searchTable2">
         <el-table-column label="供应商" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -88,19 +88,69 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="text" @click="cancel(scope.row)">撤回</el-button>
+            <el-button type="text" size="mini" @click="cancel(scope.row)">撤回</el-button>
           </template>
         </el-table-column>
       </el-table>
     </el-card>
+    <el-card>
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 300px;" height="300px" size="mini">
+        <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="150">
+          <template slot-scope="scope">
+            {{ 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.离线合同编号 }}
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="合同名称" align="center" min-width="100">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.采购合同名称 || scope.row.离线合同名称 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="采购数量" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.采购数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票数量" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.到票数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票金额" align="center" width="100">
+          <template slot-scope="scope">
+            {{ Number(scope.row.金额).toFixed(2) }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <span style="margin-left: 1000px">到票总额：{{ totalMoney.toFixed(2) }}</span>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { cancel, searchTable1, searchSupplier } from '@/api/PurchasingCenter/InvoiceSettlementApproveSearch'
+import { cancel, searchTable1, searchSupplier, searchTable2 } from '@/api/PurchasingCenter/InvoiceSettlementApproveSearch'
 import { mapGetters } from 'vuex'
-import { readFile } from '@/utils/request'
-import request from '@/utils/request'
+// import { readFile } from '@/utils/request'
+// import request from '@/utils/request'
 export default {
   name: '', // 发票结算审批
   data() {
@@ -115,7 +165,8 @@ export default {
       tableData2: [],
       tableData3: [],
       supplierValues: [],
-      supplierValue: ''
+      supplierValue: '',
+      totalMoney: 0
     }
   },
   computed: {
@@ -132,6 +183,16 @@ export default {
     this.searchSupplier()
   },
   methods: {
+    searchTable2(row) {
+      this.invoiceNumber = row.发票号
+      searchTable2(row.发票结算申请单流水号).then(response => {
+        this.tableData2 = response.data
+        this.totalMoney = 0
+        for (let i = 0; i < response.data.length; i++) {
+          this.totalMoney += parseFloat(response.data[i].金额)
+        }
+      })
+    },
     cancel(row) {
       console.log(row, 'row')
       if (Number(this.token) === 18) {
@@ -207,27 +268,27 @@ export default {
       this.supplierValue ? check = 1 : check = 0
       searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token, check, this.supplierValue).then(response => {
         this.tableData1 = response.data.rows
-        this.tableData1.map(v => {
-          this.$set(v, 'scanSrc', '')
-          return v
-        })
-        for (let i = 0; i < response.data.rows.length; i++) {
-          this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
-        }
+        // this.tableData1.map(v => {
+        //   this.$set(v, 'scanSrc', '')
+        //   return v
+        // })
+        // for (let i = 0; i < response.data.rows.length; i++) {
+        //   this.tableData1[i].scanSrc = this.searchPic(response.data.rows[i], i)
+        // }
         this.total1 = response.data.total
       })
     },
-    async searchPic(row, i) {
-      const { data } = await request({
-        url: '',
-        method: 'post',
-        data: {
-          type: '3',
-          name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票结算申请单流水号}`
-        }
-      })
-      this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
-    },
+    // async searchPic(row, i) {
+    //   const { data } = await request({
+    //     url: '',
+    //     method: 'post',
+    //     data: {
+    //       type: '3',
+    //       name: `select * from 采购管理_采购发票_附件 where 是否启用 = 1 and 发票交接流水号 = ${row.发票结算申请单流水号}`
+    //     }
+    //   })
+    //   // this.tableData1[i].scanSrc = readFile + data[0].文件标识 + '.' + data[0].文件后缀
+    // },
     handleSizeChange1(val) {
       this.pageCurrent1 = 1
       this.pageSize1 = val
diff --git a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue
index 617dd8b9..af9df3ac 100644
--- a/src/views/PurchasingCenter/OfflinePartsQuery/index.vue
+++ b/src/views/PurchasingCenter/OfflinePartsQuery/index.vue
@@ -36,6 +36,11 @@
             {{ scope.row.材料 }}
           </template>
         </el-table-column>
+        <el-table-column label="计量单位" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.计量单位 }}
+          </template>
+        </el-table-column>
         <el-table-column label="采购数量" align="center" width="80">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
diff --git a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
index 0d4ced9c..3857ea2f 100644
--- a/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
+++ b/src/views/PurchasingCenter/PurchaseSituationSearch/index.vue
@@ -35,7 +35,7 @@
           style="width:250px;margin-left: 5px"
           start-placeholder="开始日期"
           end-placeholder="结束日期"/>
-        <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="pageCurrent0=1;pageCurrent1=1;pageCurrent2=1;searchTable()">查询</el-button>
+        <el-button :disabled="loading0" type="primary" size="small" icon="el-icon-search" plain style="margin-left: 15px" @click="pageCurrent0=1;pageCurrent1=1;pageCurrent2=1;searchTable()">查询</el-button>
         <!--<el-button-->
         <!--plain-->
         <!--@click="open2(1)">-->
@@ -48,7 +48,7 @@
     </el-card>
 
     <el-tabs v-model="PartType" type="border-card" @tab-click="pageCurrent0=1;pageCurrent1=1;pageCurrent2=1;searchTable()">
-      <el-tab-pane label="标准件" name="标准件">
+      <el-tab-pane :disabled="loading0" label="标准件" name="标准件">
         <el-table v-loading="loading0" :data="tableData0" size="mini" height="700px" border stripe @sort-change="sortChange0">
           <el-table-column align="center" prop="询价状态编号" label="采购状态" width="110px" sortable="custom" fixed="left">
             <template slot-scope="scope">
@@ -58,8 +58,8 @@
               <!--<el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>-->
               <span v-if="!scope.row.人员编号" type="primary" size="small">未分配</span>
               <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
-              <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
-              <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
+              <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)===1" type="success" size="small">已询价</span>
+              <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==1" type="info" size="small">已采购</span>
             </template>
           </el-table-column>
           <el-table-column align="center" label="机床图号" prop="机床图号" width="94px" show-overflow-tooltip fixed="left">
@@ -117,6 +117,11 @@
               {{ 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="90px">-->
           <!--            <template slot-scope="scope">-->
           <!--              <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
@@ -171,7 +176,7 @@
             @current-change="handleCurrentChange0"/>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="外购件" name="外购件">
+      <el-tab-pane :disabled="loading0" label="外购件" name="外购件">
         <el-table v-loading="loading1" :data="tableData1" size="mini" height="700px" border stripe @sort-change="sortChange1">
           <el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom" fixed="left">
             <template slot-scope="scope">
@@ -241,6 +246,11 @@
               {{ 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="90px">-->
           <!--            <template slot-scope="scope">-->
           <!--              <span v-if="Number(scope.row.到货数量) >= Number(scope.row.采购数量)">已到货</span>-->
@@ -296,7 +306,7 @@
             @current-change="handleCurrentChange1"/>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="基本件" name="基本件">
+      <el-tab-pane :disabled="loading0" label="基本件" name="基本件">
         <el-table v-loading="loading2" :data="tableData2" size="mini" height="700px" border stripe @sort-change="sortChange2">
           <el-table-column align="center" label="采购状态" prop="询价状态编号" width="110px" sortable="custom" fixed="left">
             <template slot-scope="scope">
@@ -719,7 +729,8 @@ export default {
               不合格数量: response.data.result[i].不合格数量,
               任务分配时间: response.data.result[i].任务分配时间,
               操作日期: response.data.result[i].操作日期,
-              采购时间: response.data.result[i].采购时间
+              采购时间: response.data.result[i].采购时间,
+              计量单位: response.data.result[i].计量单位
             })
           }
         }
@@ -797,7 +808,8 @@ export default {
               不合格数量: response.data.result[i].不合格数量,
               操作日期: response.data.result[i].操作日期,
               采购时间: response.data.result[i].采购时间,
-              任务分配时间: response.data.result[i].任务分配时间
+              任务分配时间: response.data.result[i].任务分配时间,
+              计量单位: response.data.result[i].计量单位
             })
           }
         }
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index 564261b1..5645fabb 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -111,7 +111,7 @@
       <span>到票号：</span>
       <el-input v-model="invoiceNumber" size="small" placeholder="请选择到票结算申请单" readonly/>
       <el-button :disabled="disabled" type="distribution" 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: 420px;" height="420px" size="mini">
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 380px;" height="380px" size="mini">
         <el-table-column label="名称" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -152,6 +152,11 @@
             {{ scope.row.到票数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="到票金额" align="center" width="100">
+          <template slot-scope="scope">
+            {{ Number(scope.row.到票金额).toFixed(2) }}
+          </template>
+        </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
@@ -162,6 +167,7 @@
           </template>
         </el-table-column>
       </el-table>
+      <span style="margin-left: 1120px">到票总额：{{ totalMoney.toFixed(2) }}</span>
     </el-card>
 
     <el-dialog v-el-drag-dialog :title="title1" :visible.sync="dialogVisible1" center style="min-height: 300px" width="680px">
@@ -243,7 +249,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="900px">
+    <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="950px">
       <span>供应商：</span>
       <el-input v-model="supplierName" size="small" placeholder="请选择供应商到票" style="margin: 0 5px 10px 0;" readonly/>
       <el-radio-group v-show="false" v-model="contractType" size="small" @change="searchTable01()">
@@ -274,12 +280,12 @@
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" min-width="150">
+        <el-table-column label="图号或型号" align="center" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="规格" align="center" min-width="150">
+        <el-table-column label="规格" align="center" width="130" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.规格 }}
           </template>
@@ -289,12 +295,12 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到货数量" align="center" width="90">
+        <el-table-column label="已到货数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.已到货数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到票数量" align="center" width="90">
+        <el-table-column label="已到票数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.到票数量 }}
           </template>
@@ -304,6 +310,11 @@
             <el-input-number v-model="scope.row.本次到票数量" :min="0" :max="scope.row.已到货数量-scope.row.到票数量" class="editWorkTime" size="mini" controls-position="right" style="width: 100%;"/>
           </template>
         </el-table-column>
+        <el-table-column label="到票金额" align="center" width="90">
+          <template slot-scope="scope">
+            {{ scope.row.单价 * scope.row.本次到票数量 }}
+          </template>
+        </el-table-column>
       </el-table>
       <el-table v-show="type===4" ref="multipleTable" :data="tableData03" border style="width: 100%;max-height: 250px;" height="250px" size="mini" @selection-change="handleSelectionChange">
         <el-table-column :selectable="selectable" type="selection" align="center" width="45"/>
@@ -361,6 +372,7 @@ export default {
   name: '', // 发票结算申请
   data() {
     return {
+      totalMoney: 0,
       createOrder_disable: false,
       submitEdit_disable: false,
       disabled: false,
@@ -611,7 +623,11 @@ export default {
       this.supplierValue = row.供应商流水号
       Number(row.是否提交申请) === 1 ? this.disabled = true : this.disabled = false
       searchTable2(row.发票结算申请单流水号).then(response => {
+        this.totalMoney = 0
         this.tableData2 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.totalMoney = this.totalMoney + parseFloat(response.data[i].到票金额)
+        }
       })
     },
     addInStoreRecord() {
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
index 9a3cb3e8..889b9837 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue
@@ -110,7 +110,7 @@
       <h4 style="margin: 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: 420px;" height="420px" size="mini">
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 350px;" height="350px" size="mini">
         <el-table-column label="名称" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.采购物料名称 || scope.row.离线物料名称 || scope.row.采购零件名称 }}
@@ -146,7 +146,13 @@
             {{ scope.row.到票数量 }}
           </template>
         </el-table-column>
+        <el-table-column label="到票金额" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.到票金额.toFixed(2) }}
+          </template>
+        </el-table-column>
       </el-table>
+      <span style="margin-left: 1000px">到票总额：{{ totalMoney.toFixed(2) }}</span>
     </el-card>
   </div>
 </template>
@@ -160,6 +166,7 @@ export default {
   name: '', // 发票结算审批
   data() {
     return {
+      totalMoney: 0,
       date1: '',
       date2: '',
       tableData1: [],
@@ -316,7 +323,11 @@ export default {
     searchTable2(row) {
       this.invoiceNumber = row.发票号
       searchTable2(row.发票结算申请单流水号).then(response => {
+        this.totalMoney = 0
         this.tableData2 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.totalMoney += parseFloat(response.data[i].到票金额)
+        }
       })
     }
   }
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue
index 58b83916..83010c20 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking/index.vue
@@ -7,7 +7,7 @@
     </el-card>
 
     <el-card>
-      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="400px" size="mini">
+      <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="300px" size="mini" @row-click="searchTable2">
         <el-table-column label="供应商" prop="供应商名称" align="center" width="180" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -91,11 +91,57 @@
           @current-change="handleCurrentChange1"/>
       </div>
     </el-card>
+    <el-card>
+      <h4 style="margin: 5px;display: inline-block;width: 150px;">到结算申请单明细</h4>
+      <el-table :data="tableData2" border highlight-current-row style="width: 100%;max-height: 350px;" height="350px" size="mini">
+        <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="180">
+          <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="150" show-overflow-tooltip>
+          <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.离线合同编号 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="合同名称" align="center" min-width="100">
+          <template slot-scope="scope">
+            {{ scope.row.采购合同名称 || scope.row.离线合同名称 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票数量" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.到票数量 }}
+          </template>
+        </el-table-column>
+        <el-table-column label="到票金额" align="center" width="100">
+          <template slot-scope="scope">
+            {{ scope.row.到票金额.toFixed(2) }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <span style="margin-left: 1000px">到票总额：{{ totalMoney.toFixed(2) }}</span>
+    </el-card>
   </div>
 </template>
 
 <script>
-import { searchSupplier, searchTable1, cancel } from '@/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking'
+import { searchSupplier, searchTable1, cancel, searchTable2 } from '@/api/WorkshopProcurement/InvoiceSettlementApproveSearchMetalworking'
 import { mapGetters } from 'vuex'
 
 export default {
@@ -106,7 +152,9 @@ export default {
       total1: 0,
       pageCurrent1: 1,
       pageSize1: 10,
-      tableData1: []
+      tableData1: [],
+      tableData2: [],
+      totalMoney: 0
     }
   },
   computed: {
@@ -122,6 +170,16 @@ export default {
     this.searchTable1()
   },
   methods: {
+    searchTable2(row) {
+      this.invoiceNumber = row.发票号
+      searchTable2(row.发票结算申请单流水号).then(response => {
+        this.totalMoney = 0
+        this.tableData2 = response.data
+        for (let i = 0; i < response.data.length; i++) {
+          this.totalMoney += parseFloat(response.data[i].到票金额)
+        }
+      })
+    },
     cancel(row) {
       if (Number(this.token) === 18) {
         cancel(row.发票结算申请单流水号, this.token).then(response => {
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index c5328e8c..9559305a 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -91,10 +91,11 @@ export default {
       this.timer = setInterval(this.comfirmUrgentItem, 1000 * 60 * 5)
       this.searchtableSupplement() // 报废补投(制造)
       this.timer = setInterval(this.searchtableSupplement, 1000 * 60 * 5)
-    } else if (this.token.toString() === '21') { // 21 装配部长
-      this.comfirmDeliver()
-      this.timer = setInterval(this.comfirmDeliver, 1000 * 60 * 5)
     }
+    // else if (this.token.toString() === '21') { // 21 装配部长
+    //   this.comfirmDeliver()
+    //   this.timer = setInterval(this.comfirmDeliver, 1000 * 60 * 5)
+    // }
   },
   beforeDestroy() {
     clearInterval(this.timer)
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 20cf9743..7432f53c 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -107,9 +107,9 @@ export default {
           document.getElementsByClassName('navbar')[0].style.minWidth = '1680px'
           break
         case 'AssemblyTaskAssignment': // 装配任务分配
-          document.getElementById('app-main').style.width = '1680px'
-          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1680px'
-          document.getElementsByClassName('navbar')[0].style.minWidth = '1680px'
+          document.getElementById('app-main').style.width = '1690px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1690px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1690px'
           break
         default:
           document.getElementById('app-main').style.width = '1380px'