From 840907d66f3ce15efa8c6b196948191110f70885 Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Wed, 27 Feb 2019 19:18:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E7=AE=B1=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                          |  2 +-
 .../GroupMatching/index.vue                   |  2 +
 .../PartAssignment/index.vue                  |  2 +-
 .../CreatePackingList/index.vue               | 40 +++++++++----------
 src/views/layout/components/Navbar.vue        |  2 +-
 5 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index c4edcdbc..38aeec07 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -19,7 +19,7 @@ const service = axios.create({
   // baseURL: `http://192.168.1.149:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
-  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://localhost:8411/submit/MESCommonBase.ashx`,
   // baseURL: `http://localhost:8077/submit/MESCommonBase.ashx`,
   // baseURL: `http://192.168.0.112:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
diff --git a/src/views/ManufacturingCenter/GroupMatching/index.vue b/src/views/ManufacturingCenter/GroupMatching/index.vue
index e8943e1f..74a0d86e 100644
--- a/src/views/ManufacturingCenter/GroupMatching/index.vue
+++ b/src/views/ManufacturingCenter/GroupMatching/index.vue
@@ -51,8 +51,10 @@
       <el-table
         v-loading="loading"
         :data="tableData"
+        :summary-method="getSummaries"
         style="width: 100%;max-height: 600px"
         height="300"
+        show-summary
         highlight-current-row
         border>
         <el-table-column align="center" label="序号" type="index" width="60"/>
diff --git a/src/views/ManufacturingCenter/PartAssignment/index.vue b/src/views/ManufacturingCenter/PartAssignment/index.vue
index 140c71a6..19203fd9 100644
--- a/src/views/ManufacturingCenter/PartAssignment/index.vue
+++ b/src/views/ManufacturingCenter/PartAssignment/index.vue
@@ -1101,7 +1101,7 @@ export default {
           this.MaterialName[i] = val[i].零件名称
           this.PartToolNumber[i] = val[i].零件图号
           this.Material[i] = val[i].材料
-          this.NumberOfParts[i] = val[i].需求数量
+          this.NumberOfParts[i] = val[i].零件数量
           this.ReMarks[i] = val[i].零件备注
         }
       } else if (this.PartType === '外购件') {
diff --git a/src/views/TechnologyCenter/CreatePackingList/index.vue b/src/views/TechnologyCenter/CreatePackingList/index.vue
index 43ce1c0c..8aa4088a 100644
--- a/src/views/TechnologyCenter/CreatePackingList/index.vue
+++ b/src/views/TechnologyCenter/CreatePackingList/index.vue
@@ -80,7 +80,7 @@
         <el-table-column type="expand">
           <template slot-scope="props">
             <el-table
-              :data="props.row.groupData"
+              :data="groupData"
               border
               size="mini"
               style="width: 90%">
@@ -91,34 +91,28 @@
                 width="100px"/>
               <el-table-column
                 align="center"
-                prop="类别"
                 label="类别"
-              />
+              ><template slot-scope="scope">{{ scope.row.类别 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="代号"
                 label="代号"
-              />
+              ><template slot-scope="scope">{{ scope.row.代号 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="名称"
                 label="名称"
-              />
+              ><template slot-scope="scope">{{ scope.row.名称 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="address"
                 label="规格"
-              />
+              ><template slot-scope="scope">{{ scope.row.规格 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="数量"
                 label="数量"
-              />
+              ><template slot-scope="scope">{{ scope.row.数量 }}</template></el-table-column>
               <el-table-column
                 align="center"
-                prop="备注"
                 label="备注"
-              />
+              ><template slot-scope="scope">{{ scope.row.备注 }}</template></el-table-column>
             </el-table>
           </template>
         </el-table-column>
@@ -423,7 +417,7 @@
         <el-button v-else-if="spareTitle==='编辑备件'" type="primary" @click="submitEditSpare">确定</el-button>
       </div>
     </el-dialog>
-    <div id="cjn">
+    <div v-show="false" id="cjn">
       <!--封面-->
       <table class="tg" style="width: 900px">
         <colgroup>
@@ -499,7 +493,7 @@
           <tr v-for="(list, index) in machineTableData" :key="index">
             <td class="tg-0lax">{{ list.序号 }}</td>
             <td class="tg-0lax">{{ list.代号 }}</td>
-            <td class="tg-a8eg" colspan="2">{{ list.名称 }}</td>
+            <td class="tg-0lax" colspan="2">{{ list.机床名称 }}</td>
             <td class="tg-0lax">{{ list.数量 }}</td>
             <td class="tg-0lax">{{ list.备注 }}</td>
           </tr>
@@ -516,8 +510,8 @@
             <td class="tg-13pz">数量</td>
             <td class="tg-13pz">备注</td>
           </tr>
-          <tr v-for="(list, index) in machineTableData.groupData" :key="index">
-            <td class="tg-qj3h">{{ list.序号 }}</td>
+          <tr v-for="(list, index) in groupData" :key="index">
+            <td class="tg-0lax">{{ index + 1 }}</td>
             <td class="tg-0lax">{{ list.代号 }}</td>
             <td class="tg-0lax">{{ list.名称 }}</td>
             <td class="tg-0lax">{{ list.规格 }}</td>
@@ -590,6 +584,7 @@ import $ from 'jquery'
 export default {
   data() {
     return {
+      groupData: [],
       project: [],
       projectValue: '',
       machine: [],
@@ -766,6 +761,7 @@ export default {
       const response = await getMachineData(this.receiptNum)
       const data = response.data
       console.log(data, 1111)
+      this.groupData = []
       for (let i = 0; i < data.length; i++) {
         const resp = await getGroupData(data[i].机床号)
         console.log(resp)
@@ -773,15 +769,15 @@ export default {
           item.类别 = '机床所属部件'
           return item
         })
+        this.groupData = groupData
         this.machineTableData.push({
           序号: data[i].序号,
           代号: data[i].代号,
           机床名称: data[i].名称,
           数量: data[i].数量,
-          备注: data[i].备注,
-          groupData: groupData
+          备注: data[i].备注
         })
-        console.log(this.machineTableData[0].groupData, 11112)
+        console.log(this.groupData, 11112)
       }
     },
     addMachine() {
@@ -953,6 +949,6 @@ span{
   .tg1 .tg-8zau{font-size:32px;text-align:center}
   .tg1 .tg-13pz{font-size:18px;text-align:center;vertical-align:top}
   .tg1 .tg-60hs{font-size:20px;text-align:left;vertical-align:top}
-  .tg1 .tg-0lax{text-align:left;vertical-align:top}
-  .tg1 .tg-a8eg{font-size:28px;text-align:left;vertical-align:top}
+  .tg1 .tg-0lax{text-align:center;vertical-align:top}
+  .tg1 .tg-a8eg{font-size:28px;text-align:center;vertical-align:top}
 </style>
diff --git a/src/views/layout/components/Navbar.vue b/src/views/layout/components/Navbar.vue
index 79c2e1b7..2a7eeab4 100644
--- a/src/views/layout/components/Navbar.vue
+++ b/src/views/layout/components/Navbar.vue
@@ -14,7 +14,7 @@
           </el-dropdown-item>
         </router-link>
         <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">登出</span>
+          <span style="display:block;" @click="logout">退出</span>
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>