From 841812c7e92f1c53e5b68eebc533c02b3b5ad1cc Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 24 Mar 2020 17:54:11 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E6=88=90=E7=BB=84=E9=85=8D=E5=A5=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/GroupMatching.js  |  3 +-
 .../GroupMatching/index.vue                   | 49 ++++++++++---------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js
index fe2c9d02..ec5ef062 100644
--- a/src/api/ManufacturingCenter/GroupMatching.js
+++ b/src/api/ManufacturingCenter/GroupMatching.js
@@ -36,8 +36,7 @@ export function searchTable(check1, machine, check2, groupNum, pageCurrent, page
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间生产管理工艺_基本件成组配套_查询数据_新',
-      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + '=int',
-      pagination: pageCurrent + '&' + pageSize
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
     }
   })
 }
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 9584fff2..8bf4d8ef 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -11,7 +11,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">
+      <el-select v-model="Group" size="small" clearable placeholder="组号" style="width: 150px;" @change="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">
         <el-option
           v-for="item in Groups"
           :key="item.value"
@@ -21,7 +21,7 @@
           <div style="float: right; color: #8492a6; font-size: 13px">{{ item.value2 }}</div>
         </el-option>
       </el-select>
-      <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=1000;pageCurrent=1;searchData();searchTable()">查询</el-button>
+      <el-button type="primary" plain icon="el-icon-search" size="small" style="margin-left: 20px" @click="total=0;pageSize=50;pageCurrent=1;searchData();searchTable()">查询</el-button>
     </el-card>
     <el-card>
       <el-tabs v-model="PartType2" type="border-card" style="margin-top: 10px">
@@ -77,10 +77,10 @@
           <div class="block">
             <el-pagination
               :current-page="pageCurrent"
-              :page-sizes="[10, 20, 30, 40, 50]"
+              :page-sizes="[50, 100, 150, 200]"
               :page-size="pageSize"
               :total="total"
-              layout="total"
+              layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"/>
           </div>
@@ -139,11 +139,11 @@
               <div class="block">
                 <el-pagination
                   :current-page="pageCurrent00"
-                  :page-sizes="[10, 20, 30, 40]"
+                  :page-sizes="[50, 100, 150, 200]"
                   :page-size="pageSize00"
                   :total="total00"
                   style="margin-top:10px;display:inline-block;width:50%"
-                  layout="total"
+                  layout="total, sizes, prev, pager, next, jumper"
                   @size-change="handleSizeChange00"
                   @current-change="handleCurrentChange00"/>
               </div>
@@ -199,11 +199,11 @@
               <div class="block">
                 <el-pagination
                   :current-page="pageCurrent01"
-                  :page-sizes="[10, 20, 30, 40]"
+                  :page-sizes="[50, 100, 150, 200]"
                   :page-size="pageSize01"
                   :total="total01"
                   style="margin-top:10px;display:inline-block;width:50%"
-                  layout="total"
+                  layout="total, sizes, prev, pager, next, jumper"
                   @size-change="handleSizeChange01"
                   @current-change="handleCurrentChange01"/>
               </div>
@@ -264,11 +264,11 @@
               <div class="block">
                 <el-pagination
                   :current-page="pageCurrent02"
-                  :page-sizes="[10, 20, 30, 40]"
+                  :page-sizes="[50, 100, 150, 200]"
                   :page-size="pageSize02"
                   :total="total02"
                   style="margin-top:10px;display:inline-block;width:50%"
-                  layout="total"
+                  layout="total, sizes, prev, pager, next, jumper"
                   @size-change="handleSizeChange02"
                   @current-change="handleCurrentChange02"/>
               </div>
@@ -317,10 +317,10 @@
           <div class="block" style="margin-top: 10px;">
             <el-pagination
               :current-page="pageCurrent5"
-              :page-sizes="[10, 20, 30, 40]"
+              :page-sizes="[50, 100, 150, 200]"
               :page-size="pageSize5"
               :total="total5"
-              layout="total"
+              layout="total, sizes, prev, pager, next, jumper"
               @size-change="handleSizeChange5"
               @current-change="handleCurrentChange5"/>
           </div>
@@ -398,13 +398,13 @@ export default {
       PartType: '标准件',
       PartType2: '车间生产',
       pageCurrent00: 1,
-      pageSize00: 1000,
+      pageSize00: 50,
       pageCurrent01: 1,
       pageSize01: 10,
       pageCurrent02: 1,
-      pageSize02: 1000,
+      pageSize02: 50,
       pageCurrent: 1,
-      pageSize: 1000,
+      pageSize: 50,
       pageCurrent1: 1,
       pageSize1: 10,
       pageCurrent2: 1,
@@ -496,19 +496,20 @@ export default {
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
       searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].入库时间 !== '') {
-            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
+        console.log(response.data)
+        for (let i = 0; i < response.data.result.length; i++) {
+          if (response.data.result[i].入库时间) {
+            response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
           }
-          if (response.data.rows[i].计划完成时间 !== '') {
-            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
+          if (response.data.result[i].计划完成时间) {
+            response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
           }
-          if (response.data.rows[i].机加工实际完成时间 !== '') {
-            response.data.rows[i].机加工实际完成时间 = response.data.rows[i].机加工实际完成时间.split(' ', 2)[0]
+          if (response.data.result[i].机加工实际完成时间) {
+            response.data.result[i].机加工实际完成时间 = response.data.result[i].机加工实际完成时间.split(' ', 2)[0]
           }
         }
-        this.tableData = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.tableData = response.data.result
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
       searchTable22(this.check1, this.Machine, this.check2, this.Group, this.check3, this.year, this.check4, this.month, this.check5, this.time, this.pageCurrent, this.pageSize).then(response => {

From 0958e2cf34e16d43c219500b81a8ef0bc86bf55f Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 09:46:49 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E6=88=90=E7=BB=84=E9=85=8D=E5=A5=97?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ManufacturingCenter/GroupMatching.js  | 13 +++++++++
 .../GroupMatching/index.vue                   | 29 +++++++++----------
 2 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/api/ManufacturingCenter/GroupMatching.js b/src/api/ManufacturingCenter/GroupMatching.js
index ec5ef062..ef1166e8 100644
--- a/src/api/ManufacturingCenter/GroupMatching.js
+++ b/src/api/ManufacturingCenter/GroupMatching.js
@@ -40,6 +40,19 @@ export function searchTable(check1, machine, check2, groupNum, pageCurrent, page
     }
   })
 }
+export function getTable(check1, machine, check2, groupNum, pageCurrent, pageSize) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '车间生产管理工艺_基本件成组配套_查询数据_新',
+      param: '机床流水号_check=' + check1 + '=int&机床流水号=' + machine + '=int&组件流水号_check=' + check2 + '=int&组件流水号=' + groupNum + `&PageCurrent=${pageCurrent}&PageSize=${pageSize}&PageCount=1111=int=output&ItemCount=1111=int=output`
+    }
+  })
+}
 export function searchTable22(check1, machine, check2, groupNum, check3, year, check4, month, check5, time) {
   return request({
     url: '',
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index 8bf4d8ef..d70fcc81 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -496,7 +496,6 @@ export default {
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
       searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        console.log(response.data)
         for (let i = 0; i < response.data.result.length; i++) {
           if (response.data.result[i].入库时间) {
             response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
@@ -604,16 +603,16 @@ export default {
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
       searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].入库时间 !== '') {
-            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
+        for (let i = 0; i < response.data.result.length; i++) {
+          if (response.data.result[i].入库时间) {
+            response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
           }
-          if (response.data.rows[i].计划完成时间 !== '') {
-            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
+          if (response.data.result[i].计划完成时间) {
+            response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
           }
         }
-        this.tableData = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.tableData = response.data.result
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
     },
@@ -623,16 +622,16 @@ export default {
       this.Machine ? this.check1 = 1 : this.check1 = 0
       this.Group ? this.check2 = 1 : this.check2 = 0
       searchTable(this.check1, this.Machine, this.check2, this.Group, this.pageCurrent, this.pageSize).then(response => {
-        for (let i = 0; i < response.data.rows.length; i++) {
-          if (response.data.rows[i].入库时间 !== '') {
-            response.data.rows[i].入库时间 = response.data.rows[i].入库时间.split(' ', 2)[0]
+        for (let i = 0; i < response.data.result.length; i++) {
+          if (response.data.result[i].入库时间) {
+            response.data.result[i].入库时间 = response.data.result[i].入库时间.split(' ', 2)[0]
           }
-          if (response.data.rows[i].计划完成时间 !== '') {
-            response.data.rows[i].计划完成时间 = response.data.rows[i].计划完成时间.split(' ', 2)[0]
+          if (response.data.result[i].计划完成时间) {
+            response.data.result[i].计划完成时间 = response.data.result[i].计划完成时间.split(' ', 2)[0]
           }
         }
-        this.tableData = response.data.rows
-        this.total = parseInt(response.data.total)
+        this.tableData = response.data.result
+        this.total = parseInt(response.data.output[0].ItemCount)
         this.loading = false
       })
     },

From 79435f3fdf7ca60d63d4aaeb98f979762340fa94 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 10:02:25 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagementQuery/index.vue                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index 5a71fb61..54e9d3a4 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -121,9 +121,9 @@
       </el-col>
       <el-col style="width: 370px;margin-left: 10px">
         <el-card style="height: 370px">
-          <div style="width: 110px;font-size: 18px;float: left;text-align: center;">进程</div>
-          <div style="width: 110px;font-size: 18px;float: left;text-align: center;">计划时间</div>
-          <div style="width: 110px;font-size: 18px;float: left;text-align: center;">实际时间</div>
+          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">进程</div>
+          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">计划时间</div>
+          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">实际时间</div>
           <el-form label-position="right" label-width="100px" class="ProjectPlanningManagementQuery">
             <el-row>
               <el-col style="width: 370px">

From d1a65d206315dd669ce3d2b76c5715d42123dcd4 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 10:26:40 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E8=87=AA=E5=88=B6=E4=BB=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ManufacturingCenter/StatusQuery/index.vue | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/views/ManufacturingCenter/StatusQuery/index.vue b/src/views/ManufacturingCenter/StatusQuery/index.vue
index 797a164b..5d221b14 100644
--- a/src/views/ManufacturingCenter/StatusQuery/index.vue
+++ b/src/views/ManufacturingCenter/StatusQuery/index.vue
@@ -24,7 +24,7 @@
             :value="item.value"/>
         </el-select>
         <el-input v-model="partNumber" placeholder="零件号" size="small" clearable style="width: 150px;margin: 10px 10px 0px 10px"/>
-        <el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=20;total=0;searchData()">查询</el-button>
+        <el-button type="primary" plain icon="el-icon-search" size="small" style="margin: 15px 0 0 10px" @click="pageCurrent=1;pageSize=30;total=0;searchData()">查询</el-button>
       </el-row>
     </el-card>
     <el-card>
@@ -60,14 +60,14 @@
             {{ scope.row.传递时间 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="零件状态" width="650px">
+        <el-table-column align="center" label="零件状态" width="550px">
           <template slot-scope="scope">
             <el-steps :active="scope.row.考核状态" finish-status="success" simple>
               <el-step title="投产" />
               <el-step title="工艺" />
-              <el-step title="定额" />
-              <el-step title="平衡" />
-              <el-step title="完成" />
+              <!--<el-step title="定额" />-->
+              <!--<el-step title="平衡" />-->
+              <el-step title="制造" />
               <el-step title="入库" />
               <el-step title="出库" />
             </el-steps>
@@ -77,7 +77,7 @@
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent"
-          :page-sizes="[10, 20, 30, 40, 50]"
+          :page-sizes="[30, 50, 100]"
           :page-size="pageSize"
           :total="total"
           layout="total, sizes, prev, pager, next, jumper"
@@ -108,7 +108,7 @@ export default {
       partTypeValue: null, // 零件类型
       num: null,
       pageCurrent: 1,
-      pageSize: 20,
+      pageSize: 30,
       tableData7: [],
       tableData6: [],
       tableData: [],
@@ -173,9 +173,18 @@ export default {
       this.loading0 = true
       searchTable(check1, this.machineToolValue, check2, this.groupNumberValue, check3, this.partNumber, check4, this.partStateValue, check5, this.partTypeValue, this.pageCurrent, this.pageSize).then(response => {
         for (let i = 0; i < response.data.result.length; i++) {
-          response.data.result[i].考核状态 = parseInt(response.data.result[i].考核状态) - 2
-          if (response.data.result[i].传递时间 !== undefined || response.data.result[i].hasOwnProperty('传递时间')) {
-            response.data.result[i].传递时间 = response.data.result[i].传递时间.split(' ', 2)[0]
+          if (response.data.result[i].考核状态 === 3) {
+            response.data.result[i].考核状态 = 1
+          } else if (response.data.result[i].考核状态 === 4) {
+            response.data.result[i].考核状态 = 2
+          } else if (response.data.result[i].考核状态 === 5) {
+            response.data.result[i].考核状态 = 2
+          } else if (response.data.result[i].考核状态 === 6) {
+            response.data.result[i].考核状态 = 3
+          } else if (response.data.result[i].考核状态 === 7) {
+            response.data.result[i].考核状态 = 4
+          } else if (response.data.result[i].考核状态 === 8) {
+            response.data.result[i].考核状态 = 5
           }
         }
         this.loading0 = false

From 5f05d7e727a1ed6000092e3d36e62f0cbd47b276 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 10:40:44 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E9=9B=B6=E4=BB=B6=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PartsNumberMaintenance/index.vue          | 53 +++++--------------
 .../AntonMonitoring/index.vue                 | 27 ++--------
 2 files changed, 18 insertions(+), 62 deletions(-)

diff --git a/src/views/BasicData/PartsNumberMaintenance/index.vue b/src/views/BasicData/PartsNumberMaintenance/index.vue
index 94eea197..8a209a5d 100644
--- a/src/views/BasicData/PartsNumberMaintenance/index.vue
+++ b/src/views/BasicData/PartsNumberMaintenance/index.vue
@@ -23,7 +23,7 @@
     </el-card>
     <el-card>
       <div>
-        <span style="font-size: 20px">基本件三表数量</span>
+        <span style="font-size: 20px">基本件</span>
         <el-tooltip :open-delay="1000" effect="dark" content="删除基本件三表数量" placement="top">
           <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldelete()">全部删除</el-button>
         </el-tooltip>
@@ -36,21 +36,13 @@
         <el-table-column label="零件图号" align="center" min-width="200px">
           <template slot-scope="scope">{{ scope.row.零件图号 }}</template>
         </el-table-column>
-        <el-table-column
-          label="零件名称"
-          align="center"
-          min-width="100px">
+        <el-table-column label="零件名称" align="center" min-width="100px">
           <template slot-scope="scope">{{ scope.row.零件名称 }}</template>
         </el-table-column>
-        <el-table-column
-          label="组号"
-          align="center"
-          min-width="100px">
+        <el-table-column label="组号" align="center" min-width="100px">
           <template slot-scope="scope">{{ scope.row.组号 }}</template>
         </el-table-column>
-        <el-table-column
-          label="零件数量"
-          align="center">
+        <el-table-column label="零件数量" align="center">
           <template slot-scope="scope">{{ scope.row.零件数量 }}</template>
         </el-table-column>
         <el-table-column label="部件数量" align="center">
@@ -63,19 +55,13 @@
             {{ scope.row.机床数量 }}
           </template>
         </el-table-column>
-        <el-table-column
-          label="材料"
-          align="center">
+        <el-table-column label="材料" align="center">
           <template slot-scope="scope">{{ scope.row.材料 }}</template>
         </el-table-column>
-        <el-table-column
-          label="备注"
-          align="center">
+        <el-table-column label="备注" align="center">
           <template slot-scope="scope">{{ scope.row.零件备注 }}</template>
         </el-table-column>
-        <el-table-column
-          label="零件类型"
-          align="center">
+        <el-table-column label="零件类型" align="center">
           <template slot-scope="scope">{{ scope.row.零件类型名称 }}</template>
         </el-table-column>
         <el-table-column align="center" label="分类码" width="150">
@@ -93,24 +79,13 @@
             {{ scope.row.整改类型 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
+        <el-table-column label="操作" fixed="right" align="center" width="100">
           <template slot-scope="scope">
             <el-tooltip :open-delay="1000" effect="dark" content="编辑零件数量" placement="top">
-              <el-button
-                :disabled="scope.row.考核状态>=6&&scope.row.状态==='已加工'"
-                size="mini"
-                type="primary"
-                plain
-                icon="el-icon-edit"
-                @click="type=1;handleEdit(scope.row)">编辑</el-button>
+              <el-button :disabled="scope.row.考核状态>=6&&scope.row.状态==='已加工'" size="mini" type="text" plain icon="el-icon-edit" @click="type=1;handleEdit(scope.row)"/>
             </el-tooltip>
             <el-tooltip :open-delay="1000" effect="dark" content="删除该行" placement="top">
-              <el-button
-                size="mini"
-                type="danger"
-                plain
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)">删除</el-button>
+              <el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete(scope.row)"/>
             </el-tooltip>
           </template>
         </el-table-column>
@@ -128,7 +103,7 @@
     </el-card>
     <el-card>
       <div>
-        <span style="font-size: 20px">外购件和标准件三表数量</span>
+        <span style="font-size: 20px">外购件和标准件</span>
         <el-tooltip :open-delay="1000" effect="dark" content="删除外购件和标准件数量" placement="top">
           <el-button style="float: right;margin-bottom: 3px" type="danger" size="small" plain @click="alldeleteWB()">全部删除</el-button>
         </el-tooltip>
@@ -226,7 +201,7 @@
     </el-card>
     <el-card>
       <div>
-        <div style="font-size: 20px">未投产数量</div>
+        <div style="font-size: 20px">未投产</div>
         <el-table
           :data="tableData1"
           border
@@ -291,7 +266,7 @@
       </div>
     </el-card>
     <el-card>
-      <div style="font-size: 20px">未平衡数量</div>
+      <div style="font-size: 20px">未平衡</div>
       <el-table
         :data="tableData2"
         border
@@ -350,7 +325,7 @@
       <!--      </div>-->
     </el-card>
     <el-card>
-      <div style="font-size: 20px">未分配采购零件数量</div>
+      <div style="font-size: 20px">未分配采购</div>
       <el-tabs type="border-card" @tab-click="searchTable1();searchTable2()">
         <el-tab-pane label="标准件和外购件">
           <el-table :data="tableData3" size="mini" style="max-height: 320px" height="320px" border>
diff --git a/src/views/ManufacturingCenter/AntonMonitoring/index.vue b/src/views/ManufacturingCenter/AntonMonitoring/index.vue
index a755e425..7d22fc11 100644
--- a/src/views/ManufacturingCenter/AntonMonitoring/index.vue
+++ b/src/views/ManufacturingCenter/AntonMonitoring/index.vue
@@ -4,21 +4,10 @@
       <el-badge :value="value" class="item" style="margin-bottom: 10px; float: right">
         <el-button size="small" @click="openWindow">Andon信息</el-button>
       </el-badge>
-      <el-table
-        :data="tableData"
-        style="width: 100%;"
-        size="mini"
-        height="800"
-        highlight-current-row
-        border
-        stripe>
+      <el-table :data="tableData" style="width: 100%;" size="mini" height="800" highlight-current-row border stripe>
         <el-table-column align="center" label="照片" width="50">
           <template slot-scope="scope">
-            <el-popover
-              v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'"
-              placement="top-start"
-              width="200"
-              trigger="hover">
+            <el-popover v-if="scope.row.文件标识 && scope.row.文件标识 !== 'null'" placement="top-start" width="200" trigger="hover">
               <el-button type="text" style="float:right" @click="deletePhoto(scope.row)">删除</el-button>
               <el-image :src="scope.row.文件标识 && scope.row.文件标识 !== 'null' ? (readFile + scope.row.文件标识 + '.' + scope.row.文件后缀) : readFile + '123.jpg'">
                 <div slot="error" class="image-slot">
@@ -63,16 +52,8 @@
         </el-table-column>
       </el-table>
     </el-card>
-    <el-dialog
-      :visible.sync="dialogVisible"
-      width="60%">
-      <el-table
-        :data="tableDataMassage"
-        style="width: 100%;"
-        size="mini"
-        height="500"
-        highlight-current-row
-        border>
+    <el-dialog :visible.sync="dialogVisible" width="60%">
+      <el-table :data="tableDataMassage" style="width: 100%;" size="mini" height="500" highlight-current-row border>
         <el-table-column align="center" label="工位号">
           <template slot-scope="scope">
             <el-button type="text">{{ scope.row.工位号 }}</el-button>

From 58da90ee196bdaac3a19eca075f479f73ecc6821 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 11:18:14 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SystemRrolemaintenance/index.vue          | 40 ++++++-------------
 1 file changed, 12 insertions(+), 28 deletions(-)

diff --git a/src/views/BasicData/SystemRrolemaintenance/index.vue b/src/views/BasicData/SystemRrolemaintenance/index.vue
index 3a0b31bd..9681575d 100644
--- a/src/views/BasicData/SystemRrolemaintenance/index.vue
+++ b/src/views/BasicData/SystemRrolemaintenance/index.vue
@@ -1,47 +1,31 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--      <span>角色功能:</span>-->
-      <el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>
-      <el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData()">查询</el-button>
+      <!--<el-input v-model="RoleFunctioning" size="small" clearable placeholder="请输入角色功能" style="width:200px"/>-->
+      <!--<el-button type="primary" icon="el-icon-search" size="small" style="margin-left: 15px" plain @click="searchData()">查询</el-button>-->
       <el-button type="distribution" icon="el-icon-circle-plus-outline" size="small" @click="handleAdd()">增加</el-button>
     </el-card>
     <el-card style="margin-top: 0px">
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        height="830"
-        highlight-current-row
-        border>
+      <el-table v-loading="loading" :data="tableData" height="700" highlight-current-row border style="width: 550px;">
         <el-table-column align="center" label="角色编号" width="100">
           <template slot-scope="scope">
             {{ scope.row.角色编号 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="角色功能">
+        <el-table-column align="center" label="角色功能" width="300">
           <template slot-scope="scope">
             {{ scope.row.角色功能 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="操作日期">
+        <!--<el-table-column align="center" label="操作日期">-->
+        <!--<template slot-scope="scope">-->
+        <!--{{ scope.row.操作日期 }}-->
+        <!--</template>-->
+        <!--</el-table-column>-->
+        <el-table-column label="操作" fixed="right" align="center">
           <template slot-scope="scope">
-            {{ scope.row.操作日期 }}
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="200">
-          <template slot-scope="scope">
-            <el-button
-              size="mini"
-              type="primary"
-              plain
-              icon="el-icon-edit"
-              @click="handleEdit(scope.row)">编辑</el-button>
-            <el-button
-              size="mini"
-              type="danger"
-              plain
-              icon="el-icon-delete"
-              @click="handleDelete(scope.row)">删除</el-button>
+            <el-button size="mini" type="text" plain icon="el-icon-edit" @click="handleEdit(scope.row)"/>
+            <el-button size="mini" type="text" plain icon="el-icon-delete" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>

From 804829faf67b20fab6145b4a5f91e145776dcca9 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 11:26:41 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E6=9C=BA=E5=BA=8A=E5=B7=A5=E6=97=B6?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContractDetailsInquiry/index.vue                   | 10 +++++-----
 .../ManufacturingCenter/ManHourStatistics/index.vue    |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
index cdacd5eb..39d4ca7e 100644
--- a/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
+++ b/src/views/ManufacturingCenter/ContractDetailsInquiry/index.vue
@@ -35,12 +35,12 @@
             {{ scope.row.工序名 }}
           </template>
         </el-table-column>
-        <el-table-column label="投产数" align="center" width="80">
+        <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" width="110">
+        <el-table-column label="计划准结(分)" align="center" prop="计划准备工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.计划准备工时 }}
           </template>
@@ -60,12 +60,12 @@
             {{ scope.row.计划加工日期 }}
           </template>
         </el-table-column>
-        <el-table-column label="加工件数" align="center" width="80">
+        <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" width="110">
+        <el-table-column label="准结(分)" align="center" prop="修补工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.修补工时 }}
           </template>
@@ -75,7 +75,7 @@
             {{ scope.row.修补单件工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="加工工时(分)" align="center" prop="加工工时" width="110">
+        <el-table-column label="加工工时(分)" align="center" prop="完成工时" width="110">
           <template slot-scope="scope">
             {{ scope.row.完成工时 }}
           </template>
diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index 1f63fbcb..e058b55a 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -29,7 +29,7 @@
             {{ scope.row.计划工时 }}
           </template>
         </el-table-column>
-        <el-table-column label="录入工时(分)" align="center">
+        <el-table-column label="加工工时(分)" align="center">
           <template slot-scope="scope">
             {{ scope.row.录入工时 }}
           </template>

From cd838da885810ab82b0092f2b258a6f87693a809 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 11:32:13 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E5=A4=96=E8=B4=AD=E5=A4=87=E6=96=99(?=
 =?UTF-8?q?=E7=A6=BB=E7=BA=BF)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/WorkshopProcurement/OfflineProcurement/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/WorkshopProcurement/OfflineProcurement/index.vue b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
index 03bf156f..50949a24 100644
--- a/src/views/WorkshopProcurement/OfflineProcurement/index.vue
+++ b/src/views/WorkshopProcurement/OfflineProcurement/index.vue
@@ -84,7 +84,7 @@
                 <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
               </template>
             </el-table-column>
-            <el-table-column label="离线备料计划编号" align="center" width="140">
+            <el-table-column label="离线备料单号" align="center" width="140">
               <template slot-scope="scope">
                 {{ scope.row.离线采购计划编号 }}
               </template>

From 7d139e7ea51337367a954d0d3e3ea0a1247971fc Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 13:25:18 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E4=BB=B7=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AccountingPrice/index.vue                 | 73 ++++++++++++-------
 1 file changed, 48 insertions(+), 25 deletions(-)

diff --git a/src/views/WorkshopProcurement/AccountingPrice/index.vue b/src/views/WorkshopProcurement/AccountingPrice/index.vue
index 25762223..d7bdb195 100644
--- a/src/views/WorkshopProcurement/AccountingPrice/index.vue
+++ b/src/views/WorkshopProcurement/AccountingPrice/index.vue
@@ -16,15 +16,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-table
-        v-loading="loading"
-        :data="tableData"
-        size="small"
-        highlight-current-row
-        min-height="540px"
-        height="540px"
-        stripe
-        border>
+      <el-table v-loading="loading" :data="tableData" :summary-method="getSummaries" size="small" highlight-current-row show-summary min-height="540px" height="540px" stripe border>
         <el-table-column align="center" label="采购合同编号" width="150px">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
@@ -45,7 +37,7 @@
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="数量" width="70px">
+        <el-table-column align="center" label="数量" width="70px" prop="数量">
           <template slot-scope="scope">
             {{ scope.row.数量 }}
           </template>
@@ -55,9 +47,9 @@
             <el-input v-model="scope.row.单价" size="mini" width="80px" align="center" @blur="filterNuber(scope.row.单价, scope.$index, '单价', scope.row)"/>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="总额(元)" width="90px">
+        <el-table-column align="center" label="总额(元)" width="90px" prop="金额">
           <template slot-scope="scope">
-            {{ Number(scope.row.金额).toFixed(2) }}
+            {{ scope.row.金额 }}
           </template>
         </el-table-column>
       </el-table>
@@ -75,7 +67,8 @@
   </div>
 </template>
 
-<script>import { initPayState, searchParts, Preservation } from '@/api/WorkshopProcurement/AccountingPrice'
+<script>
+import { initPayState, searchParts, Preservation } from '@/api/WorkshopProcurement/AccountingPrice'
 import { mapGetters } from 'vuex'
 export default {
   data() {
@@ -128,7 +121,6 @@ export default {
       if (value.indexOf('.') < 0 && value !== '') {
         value = parseFloat(value).toFixed(2)
       }
-      console.log(value)
       this.tableData[index][date] = value
       this.tableData[index]['金额'] = value * row.数量
       this.update(row)
@@ -140,7 +132,6 @@ export default {
         this.contractNumValue ? this.check1 = 1 : this.check1 = 0
         searchParts(this.pageCurrent, this.pageSize, this.check1, this.contractNumValue).then(response => {
           this.loading = false
-          console.log(response.data.rows)
           for (let i = 0; i < response.data.rows.length; i++) {
             if (response.data.rows[i].物料型号 === null || response.data.rows[i].物料型号 === '') {
               response.data.rows[i].物料型号 = response.data.rows[i].零件图号
@@ -156,27 +147,59 @@ export default {
                 物料名称: response.data.rows[i].物料名称,
                 数量: response.data.rows[i].数量,
                 单价: Number(response.data.rows[i].单价).toFixed(2),
-                金额: response.data.rows[i].金额
+                金额: Number(response.data.rows[i].金额).toFixed(2)
               })
             }
           }
-          console.log(response, 90)
           this.total = response.data.total
         })
       } else {
         this.tableData = []
       }
     },
-    update(row) {
-      console.log(row, 12)
-      Preservation(row.采购合同明细流水号, row.单价).then(response => {
-        if (response.data[0].result === '1') {
-          this.$message.success('编辑成功')
-          // this.searchTable()
-        } else {
-          this.$message.error('编辑失败')
+    // 合计
+    getSummaries(param) {
+      const { columns, data } = param
+      const sums = []
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = '总价'
+        } else if (index === 4) {
+          const values = data.map(item => Number(item['数量']))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return (Number(prev) + Number(curr))
+              } else {
+                return (Number(prev) + Number(curr))
+              }
+            }, 0)
+            sums[index] += ''
+          } else {
+            sums[index] = 'N/A'
+          }
+        } else if (index === 6) {
+          const values = data.map(item => Number(item['金额']))
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr)
+              if (!isNaN(value)) {
+                return (parseInt((Number(prev) + Number(curr)) * 100) / 100).toFixed(2)
+              } else {
+                return (parseInt(Number(prev) * 100) / 100).toFixed(2)
+              }
+            }, 0)
+            sums[index] += ' 元'
+          } else {
+            sums[index] = 'N/A'
+          }
         }
       })
+      return sums
+    },
+    update(row) {
+      Preservation(row.采购合同明细流水号, row.单价)
     },
     handleSizeChange(val) {
       this.pageSize = val

From 82582ea05bacfd50137ad07381e0f9b3c69b713a Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 14:21:11 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E9=87=87=E8=B4=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductionPlanQuery/index.vue             |  6 +--
 .../PurchaseContractApproval/index.vue        | 21 ++--------
 .../TechnologyCenter/QueryParts/index.vue     | 10 ++---
 .../ArrivalStateSearch/index.vue              | 12 ++++--
 .../InvoiceSettlementApplication1/index.vue   | 42 +------------------
 .../ProcurementContractEnquiry/index.vue      |  6 +--
 .../ProjectTotalSearch/index.vue              | 10 ++---
 .../PurchaseContractRequestFund1/index.vue    |  8 ++--
 8 files changed, 35 insertions(+), 80 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
index dc8254f2..1d4e73b9 100644
--- a/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProductionPlanQuery/index.vue
@@ -37,7 +37,7 @@
         :data="tableData"
         :row-class-name="tableRowClassName"
         height="570"
-        style="width: 960px; margin: 3px 0"
+        style="width: 1000px; margin: 3px 0"
         size="mini"
         border
         highlight-current-row
@@ -63,7 +63,7 @@
             {{ scope.row.规格 }}
           </template>
         </el-table-column>
-        <el-table-column label="计划投产" align="center" width="80">
+        <el-table-column label="计划投产数" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.投产总数量 }}
           </template>
@@ -78,7 +78,7 @@
             {{ scope.row.投产批次 }}
           </template>
         </el-table-column>
-        <el-table-column label="投产" align="center" width="80">
+        <el-table-column label="批次投产数" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 9ba54063..9b1bdfd9 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -22,26 +22,11 @@
       </el-select>
       <span>供应商:</span>
       <el-input v-model="supplierName" placeholder="供应商" size="small" clearable style="width:180px"/>
-      <el-button
-        type="primary"
-        plain
-        size="small"
-        icon="el-icon-search"
-        style="margin-left:10px"
-        @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-button type="primary" plain size="small" icon="el-icon-search" style="margin-left:10px" @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
     </el-card>
 
     <el-card>
-      <el-table
-        v-loading="loading1"
-        :data="tableData1"
-        size="mini"
-        stripe
-        border
-        style="width: 100%;max-height: 450px;"
-        height="450px"
-        highlight-current-row
-        @row-click="searchTable2">
+      <el-table v-loading="loading1" :data="tableData1" size="mini" stripe border style="width: 100%;max-height: 450px;" height="450px" highlight-current-row @row-click="searchTable2">
         <el-table-column label="展开" align="center" type="expand">
           <template slot-scope="scope">
             <el-form id="table" label-position="left" inline class="demo-table-expand">
@@ -130,7 +115,7 @@
               :value="item.value"/>
           </el-select>
         </el-form-item>
-        <el-form-item label="未通过原因" prop="未通过原因">
+        <el-form-item v-show="form2.审批是否通过!==2" label="未通过原因" prop="未通过原因">
           <el-input v-model="form2.未通过原因" :disabled="form2.审批是否通过!==2" size="small"/>
         </el-form-item>
       </el-form>
diff --git a/src/views/TechnologyCenter/QueryParts/index.vue b/src/views/TechnologyCenter/QueryParts/index.vue
index 442d395c..39ac82c3 100644
--- a/src/views/TechnologyCenter/QueryParts/index.vue
+++ b/src/views/TechnologyCenter/QueryParts/index.vue
@@ -298,11 +298,11 @@ export default {
     }
   },
   watch: {
-    machine(val) {
-      if (val.length > 0) {
-        this.machineValue = val[0].value
-      }
-    },
+    // machine(val) {
+    //   if (val.length > 0) {
+    //     this.machineValue = val[0].value
+    //   }
+    // },
     machineValue(val) {
       this.groupValue = ''
       this.group = []
diff --git a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
index 7e2e16d7..af415afe 100644
--- a/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
+++ b/src/views/WorkshopProcurement/ArrivalStateSearch/index.vue
@@ -14,18 +14,23 @@
     </el-card>
 
     <el-card>
-      <el-table v-loading="" :data="tableData" stripe border style="width: 100%;max-height: 600px;margin-top: 10px" height="600px" size="mini">
+      <el-table v-loading="" :data="tableData" stripe border style="width: 740px;margin-top: 10px" height="600px" size="mini">
         <el-table-column label="采购合同编号" align="center" width="140">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 }}
           </template>
         </el-table-column>
+        <el-table-column label="机床图号" align="center" width="140">
+          <template slot-scope="scope">
+            {{ scope.row.机床图号 }}
+          </template>
+        </el-table-column>
         <el-table-column label="零件名称" align="center" width="120">
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" width="130">
+        <el-table-column label="图号或型号" align="center" width="160">
           <template slot-scope="scope">
             {{ scope.row.物料型号 ? scope.row.物料型号 : scope.row.组号 }}
           </template>
@@ -40,7 +45,7 @@
             {{ scope.row.数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="已到货数量" align="center" width="100">
+        <el-table-column label="到货数量" align="center" width="100">
           <template slot-scope="scope">
             {{ scope.row.已到货数量 }}
           </template>
@@ -91,6 +96,7 @@ export default {
     },
     searchTable() {
       searchArrivalState(this.contractNumValue).then(response => {
+        console.log(response.data)
         for (let i = 0; i < response.data.length; i++) {
           if (response.data[i].物料型号 === '' || response.data[i].物料型号 === null) {
             response.data[i].物料型号 = response.data[i].零件图号
diff --git a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
index aeca874a..9e42c548 100644
--- a/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
+++ b/src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue
@@ -1,47 +1,14 @@
 <template>
   <div class="app-container">
     <el-card>
-      <!--      <span>发票号:</span>-->
       <el-input v-model="invoiceNum" placeholder="发票号\供应商" size="small" clearable/>
       <el-button type="primary" size="small" plain icon="el-icon-search" style="margin-left:10px" @click="tableData2=[];total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
       <el-button type="distribution" size="small" icon="el-icon-circle-plus-outline" style="margin-left:10px" @click="createOrder()">到票</el-button>
     </el-card>
 
     <el-card>
-      <h4 style="margin: 5px">到票结算申请单</h4>
+      <h5 style="margin: 5px">到票结算申请单</h5>
       <el-table id="expandTable" :data="tableData1" border stripe highlight-current-row style="width: 100%;" height="350px" size="mini" @row-click="searchTable2">
-        <!--        <el-table-column label="详情" type="expand">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            <el-form label-position="left" inline class="demo-table-expand">-->
-        <!--              <el-row>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <viewer>-->
-        <!--                    <img :src="scope.row.scanSrc" alt="发票扫描件" height="120px">-->
-        <!--                  </viewer>-->
-        <!--                </el-col>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <el-form-item label="已付款项">-->
-        <!--                    <span>{{ scope.row.已付款项 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="尚欠金额">-->
-        <!--                    <span>{{ scope.row.尚欠金额 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="备注">-->
-        <!--                    <span>{{ scope.row.备注 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                </el-col>-->
-        <!--                <el-col :span="6">-->
-        <!--                  <el-form-item label="是否费用类发票">-->
-        <!--                    <span>{{ scope.row.是否费用类 }}</span>-->
-        <!--                  </el-form-item><br>-->
-        <!--                  <el-form-item label="税额">-->
-        <!--                    <span>{{ scope.row.税额 }}</span>-->
-        <!--                  </el-form-item>-->
-        <!--                </el-col>-->
-        <!--              </el-row>-->
-        <!--            </el-form>-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="供应商" prop="供应商名称" align="center" width="170" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
@@ -127,7 +94,7 @@
     </el-card>
 
     <el-card>
-      <h4 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h4>
+      <h5 style="margin: 5px;display: inline-block;width: 150px;">到票结算申请单明</h5>
       <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>
@@ -152,11 +119,6 @@
             {{ 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" width="120">
           <template slot-scope="scope">
             {{ scope.row.采购合同编号 || scope.row.离线合同编号 }}
diff --git a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
index b4e0debd..4faca879 100644
--- a/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractEnquiry/index.vue
@@ -39,7 +39,7 @@
           size="small"
           plain
           icon="el-icon-search"
-          @click="total1=0;pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+          @click="total1=0;pageCurrent1=1;pageSize1=20;searchTable1()">查询</el-button>
         <el-button
           type="primary"
           size="small"
@@ -120,7 +120,7 @@
       <div class="block" style="margin-top: 10px;">
         <el-pagination
           :current-page="pageCurrent1"
-          :page-sizes="[10, 20, 30, 40]"
+          :page-sizes="[20, 30, 40, 50]"
           :page-size="pageSize1"
           :total="total1"
           style="display:inline-block;width:50%"
@@ -436,7 +436,7 @@ export default {
       supplierValue: '',
       total1: 0,
       pageCurrent1: 1,
-      pageSize1: 10,
+      pageSize1: 20,
       tableData1: [],
       loading1: false,
       dialogVisible1: false,
diff --git a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
index 4d2af4fe..de6aa7bf 100644
--- a/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
+++ b/src/views/WorkshopProcurement/ProjectTotalSearch/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-card style="width: 44%">
-      <span>项目名称:</span>
+    <el-card style="width: 800px">
+      <!--<span>项目名称:</span>-->
       <el-select v-model="projectValue" placeholder="项目名称" size="small" style="width: 180px" filterable clearable>
         <el-option
           v-for="item in project"
@@ -22,16 +22,16 @@
         plain
         icon="el-icon-download"
         style="margin-left:10px"
-        @click="exportExcel()">导出项目采购明细</el-button>
+        @click="exportExcel()">导出</el-button>
     </el-card>
-    <el-card style="width: 54%">
+    <el-card style="width: 800px">
       <el-table v-loading="" :data="tableData2" :summary-method="getSummaries1" show-summary border style="width: 100%;max-height: 700px;" height="700px">
         <el-table-column label="零件名称" align="center" width="150">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="图号或型号" align="center" width="150">
+        <el-table-column label="图号或型号" align="center" min-width="150">
           <template slot-scope="scope">
             {{ scope.row.图号或型号 }}
           </template>
diff --git a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
index b55585ca..9a62e700 100644
--- a/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
+++ b/src/views/WorkshopProcurement/PurchaseContractRequestFund1/index.vue
@@ -133,6 +133,7 @@
         </el-card>
       </el-col>
     </el-row>
+
     <el-dialog :visible.sync="dialogVisible2" title="采购合同请款" center style="min-height: 300px" width="1200px">
       <span>供应商：</span>
       <el-select v-model="supplierValue" placeholder="供应商" filterable clearable size="small" @change="searchTable01()">
@@ -166,17 +167,17 @@
         </el-table-column>
         <el-table-column label="合同总额(元)" align="center" width="110" prop="合同总额">
           <template slot-scope="scope">
-            {{ scope.row.含税总金额 }}
+            {{ parseFloat(scope.row.含税总金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="已付金额(元)" align="center" min-width="100" prop="已付金额">
           <template slot-scope="scope">
-            {{ scope.row.已付金额 }}
+            {{ parseFloat(scope.row.已付金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="申请中金额(元)" align="center" min-width="100" prop="申请中金额">
           <template slot-scope="scope">
-            {{ scope.row.申请中金额 }}
+            {{ parseFloat(scope.row.申请中金额).toFixed(2) }}
           </template>
         </el-table-column>
         <el-table-column label="请款金额(元)" align="center" min-width="130" prop="请款金额">
@@ -359,6 +360,7 @@ export default {
         this.contractGroup.push(val[i].采购合同流水号)
         this.sumGroup.push(val[i].请款金额)
       }
+      this.SUM = parseFloat(this.SUM).toFixed(2)
     },
     submitRequestFund() { // 确认请款
       if (this.supplierValue && this.contractGroup.length !== 0) {

From 3a46bf0664f8d923d052beba65aeb057561324fc Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 14:42:04 +0800
Subject: [PATCH 11/14] ca

---
 .../CreateWarehousePurchasing/index.vue       | 38 +++----------------
 1 file changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
index 22f7cff4..4e97f14e 100644
--- a/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
+++ b/src/views/ManufacturingCenter/CreateWarehousePurchasing/index.vue
@@ -19,23 +19,11 @@
               :label="item.label"
               :value="item.value"/>
           </el-select>
-          <el-button
-            type="success"
-            size="small"
-            icon="el-icon-search"
-            style="margin-left: 10px"
-            @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable()">查询</el-button>
+          <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable()">查询</el-button>
         </el-row>
       </div>
       <div>
-        <el-table
-          v-loading="loading"
-          :data="tableData"
-          border
-          style="width: 100%;max-height: 460px;"
-          height="460"
-          size="mini"
-          @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="tableData" border style="width: 100%;max-height: 460px;" height="460" size="mini" @selection-change="handleSelectionChange">
           <el-table-column type="selection" align="center" width="55"/>
           <el-table-column label="库存状态" width="100" align="center">
             <template slot-scope="scope">
@@ -115,27 +103,13 @@
       <div slot="header">
         <span>采购明细表名称:</span>
         <el-input v-model="purchasingDetailsForm" placeholder="采购明细表名称" size="small" clearable/>
-        <el-button
-          type="success"
-          size="small"
-          icon="el-icon-search"
-          style="margin-left: 10px"
-          @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
-        <el-button
-          type="primary"
-          size="small"
-          style="margin-left: 10px"
-          @click="addpurchasingDetailsForm">创建采购明细表</el-button>
+        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent1=1;pageSize1=10;total1=0;searchTable1()">查询</el-button>
+        <el-button type="primary" size="small" style="margin-left: 10px" @click="addpurchasingDetailsForm">创建采购明细表</el-button>
         <el-tooltip :open-delay="1000" effect="dark" content="将勾选的物料库中物料选入到选中的采购明细表" placement="top">
-          <el-button
-            :disabled="Number(whetherToAllocate) === 1"
-            type="warning"
-            size="small"
-            style="margin-left: 10px"
-            @click="addMateriel">选入物料</el-button>
+          <el-button :disabled="Number(whetherToAllocate) === 1" type="warning" size="small" style="margin-left: 10px" @click="addMateriel">选入物料</el-button>
         </el-tooltip>
       </div>
-      <!--       -->
+
       <el-table v-loading="loading1" :data="tableData1" border style="max-height: 460px;" height="300px" size="mini" highlight-current-row @row-click="searchTable2">
         <el-table-column label="分配状态" align="center" min-width="170">
           <template slot-scope="scope">

From 888f5938a37010762831263afbdd0897611f95bb Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 15:11:17 +0800
Subject: [PATCH 12/14] a

---
 src/views/BasicData/MenuManagement/index.vue | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index 68cde375..b685dd09 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -9,20 +9,8 @@
           <div slot="header">
             <el-input v-model="filterTextLeft" size="small" placeholder="输入关键字进行过滤" clearable/>
           </div>
-          <el-table
-            ref="multipleTableLeft"
-            :data="fisrtLevelFilter"
-            stripe
-            highlight-current-row
-            size="mini"
-            height="calc(100vh - 330px)"
-            style="height:calc(100vh - 330px);"
-            @selection-change="handleSelectionChangeLeft">
-            <el-table-column
-              :selectable="selectable"
-              align="center"
-              type="selection"
-              width="55"/>
+          <el-table ref="multipleTableLeft" :data="fisrtLevelFilter" stripe highlight-current-row size="mini" height="calc(100vh - 330px)" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeLeft">
+            <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
             <el-table-column align="center" label="模块名称">
               <template slot-scope="scope">
                 {{ scope.row.title }}

From c3a9e0337c4f380e9b967f3de5682e6196d32cd8 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 17:15:21 +0800
Subject: [PATCH 13/14] a

---
 src/views/BasicData/MenuManagement/index.vue  | 53 +++++++++----------
 .../EquipmentConditionAnalysis/index.vue      |  3 +-
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/src/views/BasicData/MenuManagement/index.vue b/src/views/BasicData/MenuManagement/index.vue
index b685dd09..95b6274a 100644
--- a/src/views/BasicData/MenuManagement/index.vue
+++ b/src/views/BasicData/MenuManagement/index.vue
@@ -2,14 +2,14 @@
   <div class="app-container">
     <el-row>
       <el-col :span="7">
-        <el-card style="margin-bottom: 20px">
+        <el-card style="margin-bottom: 10px">
           <el-button size="small" type="distribution" @click="addFisrtLevel">创建一级菜单</el-button>
         </el-card>
         <el-card>
           <div slot="header">
             <el-input v-model="filterTextLeft" size="small" placeholder="输入关键字进行过滤" clearable/>
           </div>
-          <el-table ref="multipleTableLeft" :data="fisrtLevelFilter" stripe highlight-current-row size="mini" height="calc(100vh - 330px)" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeLeft">
+          <el-table ref="multipleTableLeft" :data="fisrtLevelFilter" stripe highlight-current-row size="mini" height="500" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeLeft">
             <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
             <el-table-column align="center" label="模块名称">
               <template slot-scope="scope">
@@ -25,7 +25,7 @@
         </el-tooltip>
       </el-col>
       <el-col :span="8">
-        <el-card style="margin-bottom: 20px">
+        <el-card style="margin-bottom: 10px">
           <span>角色:</span>
           <el-select v-model="roleName" placeholder="请选择" size="small" style="width:200px;margin-left:10px" filterable @change="getModule">
             <el-option
@@ -35,20 +35,11 @@
               :value="item.value"/>
           </el-select>
         </el-card>
-        <el-card style="height:calc(100vh - 220px);overflow: auto">
+        <el-card style="height: 550px;overflow: auto">
           <div slot="header">
             <el-input v-model="filterText" size="small" placeholder="输入关键字进行过滤" clearable/>
           </div>
-          <el-tree
-            ref="moduleTree"
-            :data="moduleTree"
-            :filter-node-method="filterNode"
-            check-strictly
-            class="moduleTree"
-            show-checkbox
-            node-key="id"
-            default-expand-all
-            @check-change="treeCheck">
+          <el-tree ref="moduleTree" :data="moduleTree" :filter-node-method="filterNode" check-strictly class="moduleTree" show-checkbox node-key="id" default-expand-all @check-change="treeCheck">
             <span slot-scope="{ node, data }" class="custom-tree-node">
               <span>{{ node.label }}</span>
               <span>
@@ -70,27 +61,15 @@
         </el-tooltip>
       </el-col>
       <el-col :span="7">
-        <el-card style="margin-bottom: 20px">
+        <el-card style="margin-bottom: 10px">
           <el-button size="small" type="distribution" @click="addSecondLevel">创建二级菜单</el-button>
         </el-card>
         <el-card>
           <div slot="header">
             <el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
           </div>
-          <el-table
-            ref="multipleTableRight"
-            :data="secondLevelFilter"
-            stripe
-            highlight-current-row
-            size="mini"
-            height="calc(100vh - 330px)"
-            style="height:calc(100vh - 330px);"
-            @selection-change="handleSelectionChangeRight">
-            <el-table-column
-              :selectable="selectable"
-              align="center"
-              type="selection"
-              width="55"/>
+          <el-table ref="multipleTableRight" :data="secondLevelFilter" stripe highlight-current-row size="mini" height="500" style="height:calc(100vh - 330px);" @selection-change="handleSelectionChangeRight">
+            <el-table-column :selectable="selectable" align="center" type="selection" width="55"/>
             <el-table-column align="center" label="模块名称">
               <template slot-scope="scope">
                 {{ scope.row.title }}
@@ -101,6 +80,22 @@
       </el-col>
     </el-row>
 
+    <el-row v-if="false">
+      <el-card>
+        <div slot="header">
+          <el-input v-model="filterTextRight" size="small" placeholder="输入关键字进行过滤" clearable/>
+        </div>
+        <el-table :data="secondLevelFilter" stripe size="mini" height="200" border>
+          <el-table-column label="序号" align="center" type="index" width="50"/>
+          <el-table-column align="center" label="模块名称">
+            <template slot-scope="scope">
+              {{ scope.row.title }}
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-card>
+    </el-row>
+
     <el-dialog :visible.sync="dialogVisible1" title="新增一级模块" center style="min-height: 300px" width="400px">
       <el-form ref="form1" :model="form1" :rules="rules1" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="模块名称" prop="moduleName">
diff --git a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
index 5de98a3c..652355e5 100644
--- a/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
+++ b/src/views/ManufacturingCenter/EquipmentConditionAnalysis/index.vue
@@ -161,7 +161,8 @@
   </div>
 </template>
 
-<script>import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
+<script>
+import { getData, getData1, getData2, getData3, getMachine, searchState } from '@/api/ManufacturingCenter/EquipmentConditionAnalysis'
 
 export default {
   data() {

From ca2bedc570f3d1d6a4043d749970168a6ab4a2b4 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Wed, 25 Mar 2020 17:17:12 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A1=E5=88=92?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProjectPlanningManagementQuery/index.vue              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
index 54e9d3a4..c430d103 100644
--- a/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
+++ b/src/views/ManufacturingCenter/ProjectPlanningManagementQuery/index.vue
@@ -119,11 +119,11 @@
           </div>
         </el-card>
       </el-col>
-      <el-col style="width: 370px;margin-left: 10px">
+      <el-col style="width: 373px;margin-left: 10px">
         <el-card style="height: 370px">
-          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">进程</div>
-          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">计划时间</div>
-          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">实际时间</div>
+          <!--<div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold">进程</div>-->
+          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold;margin-left: 100px">计划时间</div>
+          <div style="width: 110px;font-size: 14px;float: left;text-align: center;margin-top: 30px;margin-bottom: 20px;font-weight: bold;margin-left: 10px">实际时间</div>
           <el-form label-position="right" label-width="100px" class="ProjectPlanningManagementQuery">
             <el-row>
               <el-col style="width: 370px">