From 9c2b03c2b5be2c5fa5e923743097aa2061842cfd Mon Sep 17 00:00:00 2001
From: liushuai <liushuai@meswork.com>
Date: Fri, 20 Sep 2019 19:34:56 +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/ManufacturingCenter/ParseQuery.js     |  11 +
 src/assets/img/img11.png                      | Bin 0 -> 50887 bytes
 src/assets/img/img12.png                      | Bin 0 -> 51609 bytes
 src/utils/request.js                          |   2 +-
 .../AssemblyQualityInspection/index.vue       |  14 +-
 src/views/Assembly/QualityBasicData/index.vue |  41 +-
 .../index.vue                                 |  86 ++--
 .../ManufacturingCenter/ParseQuery/index.vue  | 442 +++++++++++-------
 .../Outsourcing/OutsourcingQCSearch/index.vue |  57 ++-
 .../PurchaseContractApproval/index.vue        |  14 +-
 .../ProcurementContractApproval/index.vue     |  18 +-
 11 files changed, 405 insertions(+), 280 deletions(-)
 create mode 100644 src/assets/img/img11.png
 create mode 100644 src/assets/img/img12.png

diff --git a/src/api/ManufacturingCenter/ParseQuery.js b/src/api/ManufacturingCenter/ParseQuery.js
index 3d1c1f62..02939a0c 100644
--- a/src/api/ManufacturingCenter/ParseQuery.js
+++ b/src/api/ManufacturingCenter/ParseQuery.js
@@ -32,3 +32,14 @@ export function ProcessProportion() {
     }
   })
 }
+export function searchMachine() {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      type: '1',
+      name: '机床总查询',
+      param: '机床流水号_check=' + arguments[0] + '&机床流水号=' + arguments[1]
+    }
+  })
+}
diff --git a/src/assets/img/img11.png b/src/assets/img/img11.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3ecac09ee829d3b16b7a1168c3dddae188d8146
GIT binary patch
literal 50887
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

literal 0
HcmV?d00001

diff --git a/src/assets/img/img12.png b/src/assets/img/img12.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4c53c051fd6eb25650e4470dd79a1fb455995be
GIT binary patch
literal 51609
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

literal 0
HcmV?d00001

diff --git a/src/utils/request.js b/src/utils/request.js
index b5b44666..8eaacaf2 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -23,7 +23,7 @@ export const downloadFileMachine = `http://192.168.1.231:8411/submit/downloadFil
 export const MESUploadFile = `http://192.168.1.231:8411/submit/MESUploadFile.ashx`
 export const MESDownloadFile = `http://192.168.1.231:8411/submit/MESDownloadFile.ashx`
 const service = axios.create({
-  baseURL: `http://192.168.0.103:8411/submit/MESCommonBase.ashx`,
+  baseURL: `http://192.168.1.231:8411/submit/MESCommonBase.ashx`,
   timeout: 1500000 // 请求超时时间
 })
 
diff --git a/src/views/Assembly/AssemblyQualityInspection/index.vue b/src/views/Assembly/AssemblyQualityInspection/index.vue
index ac135c9f..b49aecf2 100644
--- a/src/views/Assembly/AssemblyQualityInspection/index.vue
+++ b/src/views/Assembly/AssemblyQualityInspection/index.vue
@@ -2,8 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>机床编号:</span>
-        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
+        <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" style="margin-left: 10px" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
             :key="item.value"
@@ -13,7 +12,6 @@
             <div style="float: right; color: #8492a6; font-size: 13px">{{ item.name }}</div>
           </el-option>
         </el-select>
-        <span>组号:</span>
         <el-select v-model="groupNumberValue" filterable placeholder="组号" size="small" clearable>
           <el-option
             v-for="item in groupNumber"
@@ -21,7 +19,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>检测项:</span>
         <el-select v-model="TestValue" filterable placeholder="组号" size="small" clearable>
           <el-option
             v-for="item in Test"
@@ -29,7 +26,6 @@
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>质检情况:</span>
         <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
           <el-option
             v-for="item in qualityInspection"
@@ -42,7 +38,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%" height="600px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row stripe style="width: 100%" height="500px">
         <el-table-column align="center" label="检验情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否合格)===0||scope.row.是否合格===''" type="primary" size="small" @click="approvalPass(scope.row)">未检验</el-tag>
@@ -60,17 +56,17 @@
             {{ scope.row.机床名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="组号" align="center" width="120px">
+        <el-table-column label="组号" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="部件名称" align="center" width="120px">
+        <el-table-column label="部件名称" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.组件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="检测项" align="center" width="120px">
+        <el-table-column label="检测项" align="center" width="100px">
           <template slot-scope="scope">
             {{ scope.row.检测项 }}
           </template>
diff --git a/src/views/Assembly/QualityBasicData/index.vue b/src/views/Assembly/QualityBasicData/index.vue
index 3f9f5dd9..1dfc7a83 100644
--- a/src/views/Assembly/QualityBasicData/index.vue
+++ b/src/views/Assembly/QualityBasicData/index.vue
@@ -6,14 +6,15 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格原因</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd1()">增加</el-button>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd1()">新增</el-button>
           <el-table
             :data="tableData"
             border
             style="width: 100%;max-height: 450px;margin-top: 10px"
             height="450px"
-            highlight-current-row
-            size="small">
+            size="mini"
+            stripe
+            highlight-current-row>
             <el-table-column
               type="index"
               label="序号"
@@ -28,6 +29,7 @@
               <template slot-scope="scope">
                 <el-button
                   size="mini"
+                  plain
                   type="danger"
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
@@ -41,8 +43,8 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">不合格处理</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd2()">增加</el-button>
-          <el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd2()">新增</el-button>
+          <el-table :data="tableData1" border style="width: 100%;max-height: 450px;margin-top: 10px" stripe height="350px" highlight-current-row size="mini">
             <el-table-column
               type="index"
               label="序号"
@@ -58,6 +60,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
               </template>
@@ -72,14 +75,15 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检尺寸</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd3()">增加</el-button>
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd3()">新增</el-button>
           <el-table
             :data="tableData2"
             border
             style="width: 100%;max-height: 450px;margin-top: 10px"
-            height="450px"
+            height="350px"
+            stripe
             highlight-current-row
-            size="small">
+            size="mini">
             <el-table-column
               type="index"
               label="序号"
@@ -95,6 +99,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
               </template>
@@ -107,8 +112,8 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检外观</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
-          <el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd4()">增加</el-button>
+          <el-table :data="tableData3" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
               label="序号"
@@ -124,6 +129,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
               </template>
@@ -136,8 +142,8 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">质检形位</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
-          <el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd5()">增加</el-button>
+          <el-table :data="tableData4" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
               label="序号"
@@ -153,6 +159,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
               </template>
@@ -167,8 +174,8 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 85%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
-          <el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small" @row-click="searchTesting">
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 80%;margin-top: 15px" @click="handleAdd6()">增加</el-button>
+          <el-table :data="tableData5" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" highlight-current-row stripe size="mini" @row-click="searchTesting">
             <el-table-column
               type="index"
               label="序号"
@@ -184,6 +191,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
               </template>
@@ -196,8 +204,8 @@
           <el-row>
             <div style="margin-left: 43%;margin-top: 20px;font-weight: bold;font-size: 24px">检测项明细</div>
           </el-row>
-          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left: 90%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
-          <el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="450px" highlight-current-row size="small">
+          <el-button size="small" type="primary" icon="el-icon-circle-plus-outline" style="margin-left:80%;margin-top: 15px" @click="handleAdd7()">增加</el-button>
+          <el-table :data="tableData6" border style="width: 100%;max-height: 450px;margin-top: 10px" height="350px" stripe highlight-current-row size="mini">
             <el-table-column
               type="index"
               label="序号"
@@ -213,6 +221,7 @@
                 <el-button
                   size="mini"
                   type="danger"
+                  plain
                   icon="el-icon-delete"
                   @click="handleDelete(scope.row)">删除</el-button>
               </template>
diff --git a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
index 86b8d676..bf88644b 100644
--- a/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
+++ b/src/views/Assembly/QualityInspectionInformationInquiry/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-card>
       <el-row>
-        <span>机床编号:</span>
+        <span style="margin-left:10px">机床编号:</span>
         <el-select v-model="machineNumberValue" filterable placeholder="机床编号" size="small" clearable @change="machineChange()">
           <el-option
             v-for="item in machineNumber"
@@ -33,14 +33,14 @@
         </el-select>
       </el-row>
       <el-row style="margin-top: 20px">
-        <span class="demonstration">时间区间:</span>
+        <!--<span class="demonstration">时间区间:</span>-->
         <el-date-picker
           v-model="startTime"
           value-format="yyyy-MM-dd"
           size="small"
-          style="width: 160px"
+          style="width: 160px;margin-left: 10px"
           type="date"
-          placeholder="选择日期"/>
+          placeholder="选择开始日期"/>
         <span class="demonstration">~</span>
         <el-date-picker
           v-model="endTime"
@@ -48,17 +48,17 @@
           size="small"
           style="width: 160px"
           type="date"
-          placeholder="选择日期"/>
-        <span>质检情况:</span>
-        <el-select v-model="qualityInspectionValue" filterable placeholder="质检情况" size="small" clearable>
+          placeholder="选择结束日期"/>
+        <!--<span>质检情况:</span>-->
+        <el-select v-model="qualityInspectionValue" filterable placeholder="选择质检情况" size="small" style="width: 140px;margin-left: 50px" clearable>
           <el-option
             v-for="item in qualityInspection"
             :key="item.value"
             :label="item.label"
             :value="item.value"/>
         </el-select>
-        <span>质检人员:</span>
-        <el-select v-model="personNum" filterable placeholder="质检人员" size="small" clearable>
+        <!--<span>质检人员:</span>-->
+        <el-select v-model="personNum" filterable placeholder="选择质检人员" size="small" style="width: 140px;margin-left: 10px" clearable>
           <el-option
             v-for="item in person"
             :key="item.value"
@@ -70,7 +70,7 @@
       </el-row>
     </el-card>
     <el-card>
-      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="600px">
+      <el-table :data="tableData1" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
         <el-table-column align="center" label="禁用情况" width="80px">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否禁用)===0||scope.row.是否禁用===''" type="success" size="small" @click="approvalPass(scope.row)">未禁用</el-tag>
@@ -82,17 +82,17 @@
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" width="160px">
+        <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">
+        <el-table-column label="组号" align="center" width="60px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件型号" align="center">
+        <el-table-column label="零件型号" align="center" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -160,7 +160,7 @@
         <el-table-column label="形位" fixed="right" align="center" width="100">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini">
+              <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -185,7 +185,7 @@
         <el-table-column label="尺寸" fixed="right" align="center" width="100">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini">
+              <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -210,7 +210,7 @@
         <el-table-column label="外观" fixed="right" align="center" width="100">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini">
+              <el-table :data="gridData" class="subTableHeader" highlight-current-row size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -232,11 +232,12 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="100">
+        <el-table-column label="操作" fixed="right" align="center" min-width="120">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="primary"
+              plain
               icon="el-icon-search"
               @click="viewPicture(scope.row)">查看图片</el-button>
           </template>
@@ -255,14 +256,14 @@
       </div>
     </el-card>
     <el-card>
-      <h3 align="center">正在加工零件列表</h3>
+      <h4 style="margin-left: 45%;">正在加工零件列表</h4>
       <el-table :data="tableData10" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
         <el-table-column label="机床图号" align="center">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" width="160px">
+        <el-table-column label="机床名称" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.机床名称 }}
           </template>
@@ -272,7 +273,7 @@
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center">
+        <el-table-column label="零件图号" align="center" min-width="110px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -302,13 +303,14 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="100">
+        <el-table-column label="操作" fixed="right" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="primary"
+              plain
               icon="el-icon-search"
-              @click="viewProcedures(scope.row)">查看工序情况</el-button>
+              @click="viewProcedures(scope.row)">查看工序</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -324,34 +326,34 @@
       </div>
     </el-card>
     <el-card>
-      <h3 align="center">待加工零件列表</h3>
+      <h4 style="margin-left: 45%;">待加工零件列表</h4>
       <el-table :data="tableData20" border size="mini" highlight-current-row style="width: 100%;margin-top: 15px" height="475px">
-        <el-table-column label="机床图号" align="center">
+        <el-table-column label="机床图号" align="center" width="110px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="机床名称" align="center" width="160px">
+        <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">
+        <el-table-column label="组号" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.组号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center">
+        <el-table-column label="零件图号" align="center" width="140px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件名称" align="center">
+        <el-table-column label="零件名称" align="center" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center">
+        <el-table-column label="零件数量" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
@@ -361,7 +363,7 @@
             {{ scope.row.工艺名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="工位" align="center" width="100px">
+        <el-table-column label="工位" align="center" width="80px">
           <template slot-scope="scope">
             {{ scope.row.mes终端编号 }}
           </template>
@@ -371,13 +373,14 @@
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" align="center" width="100">
+        <el-table-column label="操作" fixed="right" align="center" width="120">
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="primary"
+              plain
               icon="el-icon-search"
-              @click="viewProcedures(scope.row)">查看工序情况</el-button>
+              @click="viewProcedures(scope.row)">查看工序</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -392,7 +395,7 @@
           @current-change="handleCurrentChange2"/>
       </div>
     </el-card>
-    <el-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible4" title="工序完成情况" center style="min-height: 300px">
       <el-row>
         <span>零件图号:</span>
         <el-input v-model="SparePartsNumber" style="width: 200px" size="small"/>
@@ -404,14 +407,15 @@
         style="width: 100%;max-height: 400px;margin-top: 20px"
         size="mini"
         height="300"
+        stripe
         highlight-current-row
         border>
-        <el-table-column align="center" label="工序顺序" width="100">
+        <el-table-column align="center" label="工序顺序" width="70">
           <template slot-scope="scope">
             {{ scope.row.工序顺序 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺名称" width="150">
+        <el-table-column align="center" label="工艺名称" width="120">
           <template slot-scope="scope">
             {{ scope.row.工艺名称 }}
           </template>
@@ -426,14 +430,14 @@
             {{ scope.row.员工姓名 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否完成" width="130">
+        <el-table-column align="center" label="工艺是否完成" width="120">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.工序状态)===4" type="success" size="small">已完成</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)===5" type="warning" size="small">报废</el-tag>
             <el-tag v-if="parseInt(scope.row.工序状态)!==4 && parseInt(scope.row.工序状态)!==5" type="primary" size="small">未完成</el-tag>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工艺是否质检" width="130">
+        <el-table-column align="center" label="工艺是否质检" width="120">
           <template slot-scope="scope">
             <el-tag v-if="parseInt(scope.row.是否质检)===1" type="success" size="small">合格</el-tag>
             <el-tag v-if="parseInt(scope.row.是否质检)===2" type="warning" size="small">不合格</el-tag>
@@ -442,9 +446,9 @@
         </el-table-column>
       </el-table>
     </el-dialog>
-    <el-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="1100px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogFormVisible" title="图片" center style="" width="800px">
       <viewer>
-        <img v-for="url in urls" :key="url" :src="url" lazy style="width: 1000px;height: 700px">
+        <img v-for="url in urls" :key="url" :src="url" lazy style="width: 700px;height: 700px">
       </viewer>
     </el-dialog>
   </div>
@@ -695,5 +699,7 @@ export default {
 </script>
 
 <style scoped>
-
+h3{
+  margin: 5px !important;
+}
 </style>
diff --git a/src/views/ManufacturingCenter/ParseQuery/index.vue b/src/views/ManufacturingCenter/ParseQuery/index.vue
index 13ad4fda..d11117ea 100644
--- a/src/views/ManufacturingCenter/ParseQuery/index.vue
+++ b/src/views/ManufacturingCenter/ParseQuery/index.vue
@@ -1,160 +1,144 @@
 <template>
   <div>
-    <el-card>
-      <span>请选择机床：</span>
-      <el-autocomplete
-        v-model="searchCriteria"
-        :fetch-suggestions="querySearch"
-        clearable
-        style="width: 200px;margin-left: 10px"
-        size="small"
-        class="inline-input"
-        placeholder="请输入内容"
-        @clear="clearMachine"
-        @select="handleSelect"/>
-      <el-tag style="margin-left: 10px; background: #EAEAEA; color: black">未开始</el-tag>
-      <el-tag style="background: #7eaced; color: black">进行中</el-tag>
-      <el-tag style="background: #ff9759; color: black">已完成</el-tag>
-    </el-card>
     <el-card>
       <div class="main">
-        <div class="process">
-          <div :class="[isActive ? color[22] : 'white']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
+        <div class="process" @click.stop="chaxun">
+          <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1770px;top:220px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[22] : 'white']" type="text" @click="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货<br>{{ `${data[0].发货百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[21] : 'white']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
+          <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1580px;top:220px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：质检部<br>对机床进行总装调试</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[21] : 'white']" type="text" @click="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data[0].总装调试百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[20] : 'white']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
+          <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1390px;top:220px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[20] : 'white']" type="text" @click="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data[0].装配质检百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[19] : 'white']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
+          <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1185px;top:105px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[19] : 'white']" type="text" @click="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data[0].电气装配百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[18] : 'white']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
+          <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 1100px;top:176px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[18] : 'white']" type="text" @click="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data[0].机械装配百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[17] : 'white']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
+          <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 1015px;top:247px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[17] : 'white']" type="text" @click="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data[0].冷作百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[16] : 'white']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
+          <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 930px;top:319px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[16] : 'white']" type="text" @click="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data[0].油漆百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[15] : 'white']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
+          <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 695px;top:220px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[15] : 'white']" type="text" @click="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data[0].成组配套百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[14] : 'white']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
+          <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 455px;top:55px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：质检部<br>对自制件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[14] : 'white']" type="text" @click="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data[0].自制质检百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[13] : 'white']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
+          <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 373px;top:283px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：质检部<br>对采购件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'white']" type="text" @click="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data[0].采购质检百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[12] : 'white']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
+          <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 160px;top:110px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[12] : 'white']" type="text" @click="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data[0].车间加工百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[11] : 'white']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
+          <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -25px;top:-1px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：外协员<br>进行外协加工</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[11] : 'white']" type="text" @click="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data[0].工序外协百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[10] : 'white']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
+          <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -230px;top:54px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[10] : 'white']" type="text" @click="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data[0].能力平衡百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[9] : 'white']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
+          <div id="son13" :class="[isActive ? color[9] : 'weikaishi']" class="module" style="position: relative;left: -415px;top:54px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：工艺部<br>制定零件定额</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[9] : 'white']" type="text" @click="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[9] : 'weikaishi']" type="text" @click.stop="searchDiv14">定额<br>{{ `${data[0].定额百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[8] : 'white']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
+          <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -597px;top:54px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：工艺部<br>制定零件工艺</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[8] : 'white']" type="text" @click="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺<br>{{ `${data[0].工艺百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[7] : 'white']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
+          <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -805px;top:1px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[7] : 'white']" type="text" @click="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data[0].自家备料百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[0] : 'white']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
+          <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:222px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[0] : 'white']" type="text" @click="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data[0].签订合同百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[1] : 'white']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
+          <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1336px;top:222px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[1] : 'white']" type="text" @click="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data[0].产品设计百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[6] : 'white']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
+          <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -1057px;top:110px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[6] : 'white']" type="text" @click="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data[0].外购备料百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[2] : 'white']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
+          <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1405px;top:222px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[2] : 'white']" type="text" @click="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data[0].零件分配百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[3] : 'white']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
+          <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1350px;top:63px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[3] : 'white']" type="text" @click="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制件<br>{{ `${data[0].自制件百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[5] : 'white']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
+          <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1435px;top:223px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[5] : 'white']" type="text" @click="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data[0].车间采购百分比}%` }}</el-button>
             </el-tooltip>
           </div>
-          <div :class="[isActive ? color[4] : 'white']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
+          <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -548px;top:300px; width: 80px;height: 48px;">
             <el-tooltip placement="top">
               <div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[4] : 'white']" type="text" @click="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
+              <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data[0].采购部采购百分比}%` }}</el-button>
             </el-tooltip>
           </div>
         </div>
@@ -163,9 +147,76 @@
     <!--初始化-->
     <div v-show="showDiv0">
       <el-card class="showDiv">
-        <div class="grid-content bg-purple" style="width: 100%; height: 340px; border: 1px solid #DCDFE6;text-align: center;line-height: 340px;color: #DCDFE6">
-          <h2>请选择项目后选择节点查看对应信息</h2>
-        </div>
+        <span>请选择机床：</span>
+        <el-autocomplete
+          v-model="searchCriteria"
+          :fetch-suggestions="querySearch"
+          clearable
+          style="width: 200px;margin-left: 10px"
+          size="small"
+          class="inline-input"
+          placeholder="请输入内容"
+          @clear="clearMachine"
+          @select="SearchMachine"/>
+        <el-table
+          :data="tableDataDiv0"
+          height="340"
+          style="width: 100%;min-height: 300px;"
+          size="mini"
+          highlight-current-row
+          border
+          @row-click="handleSelect">
+          <el-table-column
+            label="序号"
+            align="center"
+            type="index"
+            width="50"/>
+          <el-table-column align="center" label="机床图号">
+            <template slot-scope="scope">
+              {{ scope.row.机床图号 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="机床名称" min-width="150px">
+            <template slot-scope="scope">
+              {{ scope.row.机床名称 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="数量">
+            <template slot-scope="scope">
+              {{ scope.row.机床数量 }}
+            </template>
+          </el-table-column>
+          <el-table-column label="签订日期" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.合同签订日期 ? scope.row.合同签订日期.substring(0, 11) : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column label="交货期" align="center">
+            <template slot-scope="scope">
+              {{ scope.row.发货节点 ? scope.row.发货节点.substring(0, 11) : '-' }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="理论工时">
+            <template slot-scope="scope">
+              {{ scope.row.理论加工时间段 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="实际工时">
+            <template slot-scope="scope">
+              {{ scope.row.实际加工时间段 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="外协工时">
+            <template slot-scope="scope">
+              {{ scope.row.外协工时总数 }}
+            </template>
+          </el-table-column>
+          <el-table-column align="center" label="采购总价">
+            <template slot-scope="scope">
+              {{ scope.row.零件金额 }}
+            </template>
+          </el-table-column>
+        </el-table>
       </el-card>
     </div>
     <!--签订合同-->
@@ -1835,7 +1886,7 @@
 </template>
 
 <script>
-import { SelectMachine, ProcessOutsourcing, ProcessProportion } from '@/api/ManufacturingCenter/ParseQuery'
+import { SelectMachine, ProcessOutsourcing, ProcessProportion, searchMachine } from '@/api/ManufacturingCenter/ParseQuery'
 import request from '@/utils/request'
 import echarts from 'echarts'
 import Cookie from 'js-cookie'
@@ -1846,9 +1897,11 @@ export default {
       WorkPurchase: '',
       Outsourcing: '',
       Home: '',
+      check: 0,
       color: [],
       disabled: true,
       machineValue: '', // 机床流水号
+      machineValue1: '',
       searchCriteria: '', // 机床名称 V-model
       restaurants: [], // 机床名称数组
       showDiv0: true,
@@ -1877,6 +1930,7 @@ export default {
       showDiv22: false,
       valueDiv1: null, // div1 客户评级
       maxDiv1: 6, // div1 客户评级最大值
+      tableDataDiv0: [],
       tableDataDiv2: [],
       tableDataDiv3: [],
       tableDataDiv4: [],
@@ -2021,12 +2075,14 @@ export default {
       }
     }
   },
-  created() {},
+  created() {
+    this.SearchMachine1()
+  },
   methods: {
     // 跳转到零件分配
     turnToPartAs(row) {
       if (row.总未分配个数 > 0 && row.总个数 > 0) {
-        Cookie.set('machineValue', this.machineValue)
+        Cookie.set('machineValue', this.machineValue1)
         Cookie.set('group', row.组件流水号)
         this.$router.push('/ManufacturingCenter/PartAssignment')
       }
@@ -2040,7 +2096,7 @@ export default {
     // 跳转到加工进度查询
     turnToProStatus(row) {
       if (!row.实际完成时间) {
-        Cookie.set('machineValue', this.machineValue)
+        Cookie.set('machineValue', this.machineValue1)
         Cookie.set('group', row.组件流水号)
         this.$router.push('/ManufacturingCenter/ProcessingStatus')
       }
@@ -2048,7 +2104,7 @@ export default {
     // 跳转到生产计划下达
     turnIniPro(row) {
       if ((parseInt(row.自家加工件总条数) - parseInt(row.已传递条数)) > 0 && parseInt(row.自家加工件总条数) !== 0) {
-        Cookie.set('machineValue', this.machineValue)
+        Cookie.set('machineValue', this.machineValue1)
         Cookie.set('group', row.组件流水号)
         this.$router.push('/ManufacturingCenter/InitialProduction')
       }
@@ -2056,11 +2112,37 @@ export default {
     // 跳转到备料完成
     turnMaterArrMan(row) {
       if (row.状态 !== '完成') {
-        Cookie.set('machineValue', this.machineValue)
+        Cookie.set('machineValue', this.machineValue1)
         Cookie.set('group', row.组件流水号)
         this.$router.push('/ManufacturingCenter/MaterialArrivalManagement')
       }
     },
+    chaxun() {
+      this.showDiv0 = true
+      this.showDiv1 = false
+      this.showDiv2 = false
+      this.showDiv3 = false
+      this.showDiv4 = false
+      this.showDiv5 = false
+      this.showDiv6 = false
+      this.showDiv7 = false
+      this.showDiv8 = false
+      this.showDiv9 = false
+      this.showDiv10 = false
+      this.showDiv11 = false
+      this.showDiv12 = false
+      this.showDiv13 = false
+      this.showDiv14 = false
+      this.showDiv15 = false
+      this.showDiv16 = false
+      this.showDiv17 = false
+      this.showDiv18 = false
+      this.showDiv19 = false
+      this.showDiv20 = false
+      this.showDiv21 = false
+      this.showDiv22 = false
+      this.showDiv23 = false
+    },
     changeScroll1() {
       const div1 = document.getElementById('div1')
       const div2 = document.getElementById('div2')
@@ -2094,6 +2176,7 @@ export default {
     // 清空查询条件
     clearMachine() {
       this.machineValue = ''
+      this.machineValue1 = ''
       this.disabled = true
       this.showDiv0 = true
       this.showDiv1 = false
@@ -2143,6 +2226,10 @@ export default {
       this.data[0].装配质检百分比 = 0
       this.data[0].总装调试百分比 = 0
       this.data[0].发货百分比 = 0
+      this.machineValue ? this.check = 1 : this.check = 0
+      searchMachine(this.check, this.machineValue).then(response => {
+        this.tableDataDiv0 = response.data
+      })
     },
     // 机床名称查询函数
     querySearch(queryString, cb) {
@@ -2174,11 +2261,24 @@ export default {
         // !== -1为全字匹配  === 0为首字匹配
       }
     },
-    // 选择机床名称后的赋值函数
-    async handleSelect(item) {
-      // 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
+    SearchMachine1() {
+      this.machineValue ? this.check = 1 : this.check = 0
+      searchMachine(this.check, this.machineValue).then(response => {
+        this.tableDataDiv0 = response.data
+      })
+    },
+    SearchMachine(item) {
       this.machineValue = item.num
-      this.machineValue ? this.disabled = false : this.disabled = true
+      this.machineValue ? this.check = 1 : this.check = 0
+      searchMachine(this.check, this.machineValue).then(response => {
+        this.tableDataDiv0 = response.data
+      })
+    },
+    // 选择机床名称后的赋值函数
+    async handleSelect(row) {
+      // 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
+      this.machineValue1 = row.机床流水号
+      this.machineValue1 ? this.disabled = false : this.disabled = true
       this.showDiv1 = false
       this.showDiv2 = false
       this.showDiv3 = false
@@ -2206,35 +2306,35 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue}`
+          name: `select * from 综合查询_状态 where 机床流水号 = ${this.machineValue1}`
         }
       }).then(res => {
         this.isActive = true
         this.data = res.data
         console.log(res)
-        if (res.data[0].签订合同状态 === 1) { this.color[0] = 'white' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'yellow' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'green' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
-        if (res.data[0].产品设计状态 === 1) { this.color[1] = 'white' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'yellow' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'green' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
-        if (res.data[0].零件分配状态 === 1) { this.color[2] = 'white' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'yellow' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'green' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
-        if (res.data[0].自制件状态 === 1) { this.color[3] = 'white' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'yellow' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'green' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
-        if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'white' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'yellow' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'green' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
-        if (res.data[0].车间采购状态 === 1) { this.color[5] = 'white' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'yellow' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'green' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
-        if (res.data[0].外购备料状态 === 1) { this.color[6] = 'white' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'yellow' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'green' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
-        if (res.data[0].自家备料状态 === 1) { this.color[7] = 'white' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'yellow' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'green' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
-        if (res.data[0].工艺状态 === 1) { this.color[8] = 'white' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'yellow' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'green' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
-        if (res.data[0].定额状态 === 1) { this.color[9] = 'white' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'yellow' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'green' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
-        if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'white' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'yellow' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'green' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
-        if (res.data[0].工序外协状态 === 1) { this.color[11] = 'white' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'yellow' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'green' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
-        if (res.data[0].车间加工状态 === 1) { this.color[12] = 'white' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'yellow' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'green' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
-        if (res.data[0].采购质检状态 === 1) { this.color[13] = 'white' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'yellow' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'green' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
-        if (res.data[0].自制质检状态 === 1) { this.color[14] = 'white' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'yellow' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'green' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
-        if (res.data[0].成组配套状态 === 1) { this.color[15] = 'white' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'yellow' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'green' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
-        if (res.data[0].油漆状态 === 1) { this.color[16] = 'white' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'yellow' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'green' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
-        if (res.data[0].冷作状态 === 1) { this.color[17] = 'white' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'yellow' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'green' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
-        if (res.data[0].机械装配状态 === 1) { this.color[18] = 'white' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'yellow' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'green' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
-        if (res.data[0].电气装配状态 === 1) { this.color[19] = 'white' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'yellow' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'green' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
-        if (res.data[0].装配质检状态 === 1) { this.color[20] = 'white' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'yellow' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'green' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
-        if (res.data[0].总装调试状态 === 1) { this.color[21] = 'white' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'yellow' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'green' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
-        if (res.data[0].发货状态 === 1) { this.color[22] = 'white' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'yellow' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'green' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
+        if (res.data[0].签订合同状态 === 1) { this.color[0] = 'weikaishi' } else if (res.data[0].签订合同状态 === 2) { this.color[0] = 'jixingzhong' } else if (res.data[0].签订合同状态 === 3) { this.color[0] = 'yiwancheng' } else if (res.data[0].签订合同状态 === 4) { this.color[0] = 'red' }
+        if (res.data[0].产品设计状态 === 1) { this.color[1] = 'weikaishi' } else if (res.data[0].产品设计状态 === 2) { this.color[1] = 'jixingzhong' } else if (res.data[0].产品设计状态 === 3) { this.color[1] = 'yiwancheng' } else if (res.data[0].产品设计状态 === 4) { this.color[1] = 'red' }
+        if (res.data[0].零件分配状态 === 1) { this.color[2] = 'weikaishi' } else if (res.data[0].零件分配状态 === 2) { this.color[2] = 'jixingzhong' } else if (res.data[0].零件分配状态 === 3) { this.color[2] = 'yiwancheng' } else if (res.data[0].零件分配状态 === 4) { this.color[2] = 'red' }
+        if (res.data[0].自制件状态 === 1) { this.color[3] = 'weikaishi' } else if (res.data[0].自制件状态 === 2) { this.color[3] = 'jixingzhong' } else if (res.data[0].自制件状态 === 3) { this.color[3] = 'yiwancheng' } else if (res.data[0].自制件状态 === 4) { this.color[3] = 'red' }
+        if (res.data[0].采购部采购状态 === 1) { this.color[4] = 'weikaishi' } else if (res.data[0].采购部采购状态 === 2) { this.color[4] = 'jixingzhong' } else if (res.data[0].采购部采购状态 === 3) { this.color[4] = 'yiwancheng' } else if (res.data[0].采购部采购状态 === 4) { this.color[4] = 'red' }
+        if (res.data[0].车间采购状态 === 1) { this.color[5] = 'weikaishi' } else if (res.data[0].车间采购状态 === 2) { this.color[5] = 'jixingzhong' } else if (res.data[0].车间采购状态 === 3) { this.color[5] = 'yiwancheng' } else if (res.data[0].车间采购状态 === 4) { this.color[5] = 'red' }
+        if (res.data[0].外购备料状态 === 1) { this.color[6] = 'weikaishi' } else if (res.data[0].外购备料状态 === 2) { this.color[6] = 'jixingzhong' } else if (res.data[0].外购备料状态 === 3) { this.color[6] = 'yiwancheng' } else if (res.data[0].外购备料状态 === 4) { this.color[6] = 'red' }
+        if (res.data[0].自家备料状态 === 1) { this.color[7] = 'weikaishi' } else if (res.data[0].自家备料状态 === 2) { this.color[7] = 'jixingzhong' } else if (res.data[0].自家备料状态 === 3) { this.color[7] = 'yiwancheng' } else if (res.data[0].自家备料状态 === 4) { this.color[7] = 'red' }
+        if (res.data[0].工艺状态 === 1) { this.color[8] = 'weikaishi' } else if (res.data[0].工艺状态 === 2) { this.color[8] = 'jixingzhong' } else if (res.data[0].工艺状态 === 3) { this.color[8] = 'yiwancheng' } else if (res.data[0].工艺状态 === 4) { this.color[8] = 'red' }
+        if (res.data[0].定额状态 === 1) { this.color[9] = 'weikaishi' } else if (res.data[0].定额状态 === 2) { this.color[9] = 'jixingzhong' } else if (res.data[0].定额状态 === 3) { this.color[9] = 'yiwancheng' } else if (res.data[0].定额状态 === 4) { this.color[9] = 'red' }
+        if (res.data[0].能力平衡状态 === 1) { this.color[10] = 'weikaishi' } else if (res.data[0].能力平衡状态 === 2) { this.color[10] = 'jixingzhong' } else if (res.data[0].能力平衡状态 === 3) { this.color[10] = 'yiwancheng' } else if (res.data[0].能力平衡状态 === 4) { this.color[10] = 'red' }
+        if (res.data[0].工序外协状态 === 1) { this.color[11] = 'weikaishi' } else if (res.data[0].工序外协状态 === 2) { this.color[11] = 'jixingzhong' } else if (res.data[0].工序外协状态 === 3) { this.color[11] = 'yiwancheng' } else if (res.data[0].工序外协状态 === 4) { this.color[11] = 'red' }
+        if (res.data[0].车间加工状态 === 1) { this.color[12] = 'weikaishi' } else if (res.data[0].车间加工状态 === 2) { this.color[12] = 'jixingzhong' } else if (res.data[0].车间加工状态 === 3) { this.color[12] = 'yiwancheng' } else if (res.data[0].车间加工状态 === 4) { this.color[12] = 'red' }
+        if (res.data[0].采购质检状态 === 1) { this.color[13] = 'weikaishi' } else if (res.data[0].采购质检状态 === 2) { this.color[13] = 'jixingzhong' } else if (res.data[0].采购质检状态 === 3) { this.color[13] = 'yiwancheng' } else if (res.data[0].采购质检状态 === 4) { this.color[13] = 'red' }
+        if (res.data[0].自制质检状态 === 1) { this.color[14] = 'weikaishi' } else if (res.data[0].自制质检状态 === 2) { this.color[14] = 'jixingzhong' } else if (res.data[0].自制质检状态 === 3) { this.color[14] = 'yiwancheng' } else if (res.data[0].自制质检状态 === 4) { this.color[14] = 'red' }
+        if (res.data[0].成组配套状态 === 1) { this.color[15] = 'weikaishi' } else if (res.data[0].成组配套状态 === 2) { this.color[15] = 'jixingzhong' } else if (res.data[0].成组配套状态 === 3) { this.color[15] = 'yiwancheng' } else if (res.data[0].成组配套状态 === 4) { this.color[15] = 'red' }
+        if (res.data[0].油漆状态 === 1) { this.color[16] = 'weikaishi' } else if (res.data[0].油漆状态 === 2) { this.color[16] = 'jixingzhong' } else if (res.data[0].油漆状态 === 3) { this.color[16] = 'yiwancheng' } else if (res.data[0].油漆状态 === 4) { this.color[16] = 'red' }
+        if (res.data[0].冷作状态 === 1) { this.color[17] = 'weikaishi' } else if (res.data[0].冷作状态 === 2) { this.color[17] = 'jixingzhong' } else if (res.data[0].冷作状态 === 3) { this.color[17] = 'yiwancheng' } else if (res.data[0].冷作状态 === 4) { this.color[17] = 'red' }
+        if (res.data[0].机械装配状态 === 1) { this.color[18] = 'weikaishi' } else if (res.data[0].机械装配状态 === 2) { this.color[18] = 'jixingzhong' } else if (res.data[0].机械装配状态 === 3) { this.color[18] = 'yiwancheng' } else if (res.data[0].机械装配状态 === 4) { this.color[18] = 'red' }
+        if (res.data[0].电气装配状态 === 1) { this.color[19] = 'weikaishi' } else if (res.data[0].电气装配状态 === 2) { this.color[19] = 'jixingzhong' } else if (res.data[0].电气装配状态 === 3) { this.color[19] = 'yiwancheng' } else if (res.data[0].电气装配状态 === 4) { this.color[19] = 'red' }
+        if (res.data[0].装配质检状态 === 1) { this.color[20] = 'weikaishi' } else if (res.data[0].装配质检状态 === 2) { this.color[20] = 'jixingzhong' } else if (res.data[0].装配质检状态 === 3) { this.color[20] = 'yiwancheng' } else if (res.data[0].装配质检状态 === 4) { this.color[20] = 'red' }
+        if (res.data[0].总装调试状态 === 1) { this.color[21] = 'weikaishi' } else if (res.data[0].总装调试状态 === 2) { this.color[21] = 'jixingzhong' } else if (res.data[0].总装调试状态 === 3) { this.color[21] = 'yiwancheng' } else if (res.data[0].总装调试状态 === 4) { this.color[21] = 'red' }
+        if (res.data[0].发货状态 === 1) { this.color[22] = 'weikaishi' } else if (res.data[0].发货状态 === 2) { this.color[22] = 'jixingzhong' } else if (res.data[0].发货状态 === 3) { this.color[22] = 'yiwancheng' } else if (res.data[0].发货状态 === 4) { this.color[22] = 'red' }
       })
     },
     // 查询签订合同div数据
@@ -2268,7 +2368,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `select 项目流水号 from PDM_机床名称 where 机床流水号 = ${this.machineValue}`
+          name: `select 项目流水号 from PDM_机床名称 where 机床流水号 = ${this.machineValue1}`
         }
       }).then(res => {
         request({
@@ -2338,7 +2438,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue},@计划类型 = 1`
+          name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue1},@计划类型 = 1`
         }
       }).then(res => {
         this.tableDataDiv2 = res.data
@@ -2347,7 +2447,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue}`
+            name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue1}`
           }
         }).then(res => {
           this.dataDiv2.组件总数 = res.data[0].Column1
@@ -2356,7 +2456,7 @@ export default {
             method: 'post',
             data: {
               type: '3',
-              name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue} and 组号 like '9%'`
+              name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue1} and 组号 like '9%'`
             }
           }).then(res => {
             this.dataDiv2.整改组数 = res.data[0].Column1
@@ -2365,7 +2465,7 @@ export default {
               method: 'post',
               data: {
                 type: '3',
-                name: `select count(*) from 项目计划管理_组件计划_视图 where 机床流水号 = ${this.machineValue} and 计划类型 = 1 and 实际完成时间 is not null`
+                name: `select count(*) from 项目计划管理_组件计划_视图 where 机床流水号 = ${this.machineValue1} and 计划类型 = 1 and 实际完成时间 is not null`
               }
             }).then(res => {
               if (parseInt(this.dataDiv2.整改组数) !== 0) {
@@ -2488,7 +2588,7 @@ export default {
                 from PDM_零件明细表_基本件 where 是否采购 = 0 and 是否传递 = 0 group by 组件流水号) as c on 综合查询_零件分配模块信息视图.组件流水号 = c.组件流水号
                 left join (select 组件流水号,count(*) as 外购件未分配个数
                 from PDM_零件明细表_标准件和外购件 where 是否车间采购 = 0 group by 组件流水号) as d on 综合查询_零件分配模块信息视图.组件流水号 = d.组件流水号
-                where 机床流水号 = ${this.machineValue} and 组号 <> '00组' order by 组号`
+                where 机床流水号 = ${this.machineValue1} and 组号 <> '00组' order by 组号`
         }
       }).then(res => {
         this.tableDataDiv3 = res.data
@@ -2571,7 +2671,7 @@ export default {
                   left join (select 组件流水号,count(*) as 已传递条数
                   from 车间生产管理工艺_零件工序_投产信息_查询视图 where 是否传递 = 2 group by 组件流水号) as b
                   on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
-                  where 机床流水号 = ${this.machineValue} order by 组号`
+                  where 机床流水号 = ${this.machineValue1} order by 组号`
         }
       }).then(res => {
         this.tableDataDiv4 = res.data
@@ -2658,7 +2758,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 1 `
+          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 1 `
         }
       }).then(res => {
         this.tableDataDiv5 = res.data
@@ -2668,7 +2768,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 1 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
+            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 1 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
           }
         }).then(res => {
           this.dataDiv5.data1 = res.data[0].进行中
@@ -2684,7 +2784,7 @@ export default {
             method: 'post',
             data: {
               type: '3',
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 1 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
+              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 1 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
             }
           }).then(res => {
             this.dataDiv5.data2 = res.data[0].已完成
@@ -2773,7 +2873,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 2 `
+          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 2 `
         }
       }).then(res => {
         this.tableDataDiv6 = res.data
@@ -2783,7 +2883,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 2 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
+            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 2 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
           }
         }).then(res => {
           this.dataDiv6.data1 = res.data[0].进行中
@@ -2799,7 +2899,7 @@ export default {
             method: 'post',
             data: {
               type: '3',
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 2 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
+              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 2 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
             }
           }).then(res => {
             this.dataDiv6.data2 = res.data[0].已完成
@@ -2887,7 +2987,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 3 `
+          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 3 `
         }
       }).then(res => {
         this.tableDataDiv7 = res.data
@@ -2897,7 +2997,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 3 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
+            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 3 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
           }
         }).then(res => {
           this.dataDiv7.data1 = res.data[0].进行中
@@ -2913,7 +3013,7 @@ export default {
             method: 'post',
             data: {
               type: '3',
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 3 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
+              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 3 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
             }
           }).then(res => {
             this.dataDiv7.data2 = res.data[0].已完成
@@ -3001,7 +3101,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue} and 计划类型 = 4 `
+          name: ` select * from 车间管理_工作计划 where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 `
         }
       }).then(res => {
         this.tableDataDiv8 = res.data
@@ -3011,7 +3111,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 4 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue}`
+            name: `select COUNT(*) as 进行中 from  车间管理_工作计划 where 计划类型 = 4 and (开始时间 is not null and 开始时间 <> '') and (结束时间 is null or 结束时间 = '') and 机床流水号 = ${this.machineValue1}`
           }
         }).then(res => {
           this.dataDiv8.data1 = res.data[0].进行中
@@ -3027,7 +3127,7 @@ export default {
             method: 'post',
             data: {
               type: '3',
-              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 4 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue}`
+              name: ` select COUNT(*) as 已完成 from  车间管理_工作计划 where 计划类型 = 4 and 开始时间 is not null and 开始时间 <> '' and 结束时间 is not null and 结束时间 <> '' and 机床流水号 = ${this.machineValue1}`
             }
           }).then(res => {
             this.dataDiv8.data2 = res.data[0].已完成
@@ -3121,7 +3221,7 @@ export default {
                 group by 组号,组件名称) as 前几列
                 left join (SELECT 组号,'未完成' as 完成时间
                 from 车间生产管理工艺_零件工艺计划_传递后_视图
-                where 机床流水号 = ${this.machineValue} and isnull(入库数量,0) <> isnull(批次数量,0)
+                where 机床流水号 = ${this.machineValue1} and isnull(入库数量,0) <> isnull(批次数量,0)
                 group by 组号) as 未完成组
                 on 前几列.组号 = 未完成组.组号`
         }
@@ -3141,7 +3241,7 @@ export default {
                      where 采购管理_采购合同_采购部.是否未通过 = 0
                      ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
                      left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-                     WHERE  机床流水号 = N'${this.machineValue}'
+                     WHERE  机床流水号 = N'${this.machineValue1}'
                      union
                      SELECT [机床图号] ,[机床流水号] ,[组号] ,[组件名称] ,[组件流水号] ,[零件名称] ,[零件图号] ,规格 ,[零件数量] ,通过的合同.已到货数量
                      FROM MRP_计划订单_组件零件清单_基本件_视图
@@ -3151,9 +3251,9 @@ export default {
                     where 采购管理_采购合同_采购部.是否未通过 = 0
                     ) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号
                     left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-                    where 机床流水号 = '${this.machineValue}'
+                    where 机床流水号 = '${this.machineValue1}'
                     ) as a
-                    where a.机床流水号 = '${this.machineValue}'
+                    where a.机床流水号 = '${this.machineValue1}'
                     group by a.组号,a.组件名称
                     order by a.组号`
           }
@@ -3172,7 +3272,7 @@ export default {
                     dbo.车间管理_车间采购_请购单明细.已到货数量
                     FROM         dbo.PDM_组件名称 RIGHT OUTER JOIN
                     dbo.车间管理_车间采购_请购单明细 ON dbo.PDM_组件名称.组件流水号 = dbo.车间管理_车间采购_请购单明细.组件流水号
-                    ) as a where a.机床流水号 = ${this.machineValue}
+                    ) as a where a.机床流水号 = ${this.machineValue1}
                     group by a.[组号],a.组件名称`
             }
           }).then(res => {
@@ -3213,7 +3313,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue}, @计划类型=4`
+          name: `exec 项目计划管理_项目详细计划_查询数据 @机床流水号=${this.machineValue1}, @计划类型=4`
         }
       }).then(res => {
         this.tableDataDiv10 = res.data
@@ -3224,7 +3324,7 @@ export default {
             type: '3',
             name: `select COUNT(*) as 未完成
                    from 项目计划管理_组件计划_视图
-                   where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is null`
+                   where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is null`
           }
         }).then(res => {
           if (res.data[0].未完成 !== 0) {
@@ -3241,7 +3341,7 @@ export default {
               type: '3',
               name: `select COUNT(*) as 已完成
                      from 项目计划管理_组件计划_视图
-                     where 机床流水号 = ${this.machineValue} and 计划类型 = 4 and 实际完成时间 is not null`
+                     where 机床流水号 = ${this.machineValue1} and 计划类型 = 4 and 实际完成时间 is not null`
             }
           }).then(res => {
             if (res.data[0].已完成 !== 0) {
@@ -3359,7 +3459,7 @@ export default {
         */
         data: {
           type: '3',
-          name: `declare @机床流水号 int = ${this.machineValue}
+          name: `declare @机床流水号 int = ${this.machineValue1}
                   select *,(case when 100 * 已备料条数/零件条数 = 100 then '' else '——' end) as 完成时间 from (
                   select case when 已备料条数 = 零件条数 then '完成' else '未完成' end as 状态
                   ,所有.*,已备料条数
@@ -3471,7 +3571,7 @@ export default {
                   ,sum([批次数量]) as 零件总数量
                ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
                   ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
-              FROM [质检管理_基本件数据_查询视图] where 机床流水号 = ${this.machineValue}
+              FROM [质检管理_基本件数据_查询视图] where 机床流水号 = ${this.machineValue1}
               group by 组号, 组件名称 order by 组号`
         }
       }).then(res => {
@@ -3520,10 +3620,10 @@ export default {
             from (
             SELECT 机床流水号,组号,组件名称
 
-            ,(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 外购件数
-            ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) = isnull(零件数量,0)) as 已采购外购件数
-            ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购外购件数
-            ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数外购件数
+            ,(select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 外购件数
+            ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) = isnull(零件数量,0)) as 已采购外购件数
+            ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购外购件数
+            ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数外购件数
             FROM MRP_计划订单_组件零件清单_标准件和外购件_视图
             left join (
             select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
@@ -3531,7 +3631,7 @@ export default {
             where 采购管理_采购合同_采购部.是否未通过 = 0
             ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
             left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-            where 机床流水号 is not null and 零件类型 = 2 and 机床流水号 = ${this.machineValue}
+            where 机床流水号 is not null and 零件类型 = 2 and 机床流水号 = ${this.machineValue1}
             ) as a
             group by 机床流水号,组号,组件名称 order by 组号
             `
@@ -3553,10 +3653,10 @@ export default {
               from (
               SELECT 机床流水号,组号
               ,组件名称
-              ,(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 标准件数
-              ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) = isnull(零件数量,0)) as 已采购标准件数
-              ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购标准件数
-              ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数标准件数
+              ,(select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 标准件数
+              ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) = isnull(零件数量,0)) as 已采购标准件数
+              ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购标准件数
+              ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数标准件数
               FROM MRP_计划订单_组件零件清单_标准件和外购件_视图
               left join (
                select 采购管理_采购合同_采购部.*,组件零件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
@@ -3564,7 +3664,7 @@ export default {
               where 采购管理_采购合同_采购部.是否未通过 = 0
               ) as 通过的合同 on 通过的合同.组件零件流水号 = MRP_计划订单_组件零件清单_标准件和外购件_视图.组件零件流水号
               left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-              where 机床流水号 is not null and 零件类型 = 1 and 机床流水号 = ${this.machineValue}
+              where 机床流水号 is not null and 零件类型 = 1 and 机床流水号 = ${this.machineValue1}
               ) as a
               group by 机床流水号,组号
               ,组件名称 order by 组号`
@@ -3584,10 +3684,10 @@ export default {
                 ,SUM(总到货数基本件数 ) as 总到货数基本件数
                 from (
                 SELECT 机床流水号,组号,组件名称
-                ,(select COUNT(*) where 机床流水号 = ${this.machineValue}) as 基本件数
-                ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) = isnull(零件数量,0)) as 已采购基本件数
-                ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购基本件数
-                ,(select COUNT(*) where 机床流水号 = ${this.machineValue} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数基本件数
+                ,(select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 基本件数
+                ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) = isnull(零件数量,0)) as 已采购基本件数
+                ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) <> isnull(零件数量,0)) as 部分采购基本件数
+                ,(select COUNT(*) where 机床流水号 = ${this.machineValue1} and isnull(数量,0) <> 0 and isnull(数量,0) = isnull(已到货数量,0)) as 总到货数基本件数
                 FROM MRP_计划订单_组件零件清单_基本件_视图
                 left join (
                  select 采购管理_采购合同_采购部.*,组件零件基本件流水号,数量,已到货数量 from 采购管理_采购合同明细_采购部
@@ -3595,7 +3695,7 @@ export default {
                 where 采购管理_采购合同_采购部.是否未通过 = 0
                 ) as 通过的合同 on 通过的合同.组件零件基本件流水号 = MRP_计划订单_组件零件清单_基本件_视图.组件零件基本件流水号
                 left join 采购管理_供应商 on 通过的合同.供应商流水号 = 采购管理_供应商.供应商流水号
-                where 机床流水号 is not null  and 机床流水号 = ${this.machineValue}
+                where 机床流水号 is not null  and 机床流水号 = ${this.machineValue1}
                 ) as a
                 group by 机床流水号,组号,组件名称 order by 组号`
             }
@@ -3643,10 +3743,10 @@ export default {
             ,SUM(已到货基本件数 ) as 总到货数基本件数
             from (
             select 组号,组件名称,
-            (select COUNT(*) where 机床流水号 =${this.machineValue} and 基本件流水号 is not null) as 基本件数,
-            (select COUNT(*) where 机床流水号 =${this.machineValue} and 基本件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
-            (select COUNT(*) where 机床流水号 =${this.machineValue} and 基本件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
-            from 车间采购_综合查询视图 where 机床流水号 = ${this.machineValue}
+            (select COUNT(*) where 机床流水号 =${this.machineValue1} and 基本件流水号 is not null) as 基本件数,
+            (select COUNT(*) where 机床流水号 =${this.machineValue1} and 基本件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
+            (select COUNT(*) where 机床流水号 =${this.machineValue1} and 基本件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
+            from 车间采购_综合查询视图 where 机床流水号 = ${this.machineValue1}
             ) as a
             group by a.组号,a.组件名称 order by 组号`
         }
@@ -3664,10 +3764,10 @@ export default {
               ,SUM(已到货基本件数 ) as 总到货数基本件数
               from (
               select 组号,组件名称,
-              (select COUNT(*) where 机床流水号 =${this.machineValue} and 标准件和外购件流水号 is not null) as 基本件数,
-              (select COUNT(*) where 机床流水号 =${this.machineValue} and 标准件和外购件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
-              (select COUNT(*) where 机床流水号 =${this.machineValue} and 标准件和外购件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
-              from 车间采购_综合查询视图 where 机床流水号 =${this.machineValue}
+              (select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null) as 基本件数,
+              (select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and 采购合同明细流水号 is not null) as 已采购基本件数,
+              (select COUNT(*) where 机床流水号 =${this.machineValue1} and 标准件和外购件流水号 is not null and isnull(零件数量,0) = isnull(已到货数量,0)) as 已到货基本件数
+              from 车间采购_综合查询视图 where 机床流水号 =${this.machineValue1}
               ) as a
               group by a.组号,a.组件名称 order by 组号`
           }
@@ -3704,10 +3804,10 @@ export default {
       this.showDiv22 = false
       this.dataDiv18.yDataA = []
       this.dataDiv18.xData = []
-      ProcessOutsourcing(this.machineValue).then(response => {
+      ProcessOutsourcing(this.machineValue1).then(response => {
         this.tableDataDiv18 = response.data
       })
-      ProcessProportion(this.machineValue).then(response => {
+      ProcessProportion(this.machineValue1).then(response => {
         for (let i = 0; i < response.data.length; i++) {
           this.dataDiv18.xData.push(response.data[i].工艺名称)
           this.dataDiv18.yDataA.push(response.data[i].零件数量)
@@ -3777,11 +3877,11 @@ export default {
             ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
             ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
             FROM (
-            select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件制造部数据_查询视图 where 机床流水号 = ${this.machineValue}
+            select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件制造部数据_查询视图 where 机床流水号 = ${this.machineValue1}
             union
-            select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部基本件数据_查询视图 where 机床流水号 = ${this.machineValue}
+            select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部基本件数据_查询视图 where 机床流水号 = ${this.machineValue1}
             union
-            select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部外购件数据_查询视图 where 机床流水号 = ${this.machineValue}) as a
+            select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件采购部外购件数据_查询视图 where 机床流水号 = ${this.machineValue1}) as a
             group by a.组号, a.组件名称 order by 组号`
         }
       }).then(res => {
@@ -3827,10 +3927,10 @@ export default {
             SUM(外购备料到货总数) as 外购备料到货总数,
             SUM(外购备料出库总数) as 外购备料出库总数 from
             (select 组号,组件名称,
-            (select COUNT(*) where 机床流水号 = ${this.machineValue}) as 外购备料总数,
-             (select COUNT(*) where 机床流水号 = ${this.machineValue} and 是否到货 = 1) as 外购备料到货总数,
-              (select COUNT(*) where 机床流水号 = ${this.machineValue} and 是否出库 = 1) as 外购备料出库总数
-              from [dbo].[备料管理_采购计划明细_查询数据_视图] where 机床流水号 = ${this.machineValue}) as a
+            (select COUNT(*) where 机床流水号 = ${this.machineValue1}) as 外购备料总数,
+             (select COUNT(*) where 机床流水号 = ${this.machineValue1} and 是否到货 = 1) as 外购备料到货总数,
+              (select COUNT(*) where 机床流水号 = ${this.machineValue1} and 是否出库 = 1) as 外购备料出库总数
+              from [dbo].[备料管理_采购计划明细_查询数据_视图] where 机床流水号 = ${this.machineValue1}) as a
               group by 组号,组件名称`
         }
       }).then(res => {
@@ -3878,7 +3978,7 @@ export default {
         data: {
           type: '3',
           name: `SELECT *
-  FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue} and 组件流水号 is not null`
+  FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue1} and 组件流水号 is not null`
         }
       }).then(res => {
         this.tableDataDiv21 = res.data
@@ -3925,7 +4025,7 @@ export default {
         data: {
           type: '3',
           name: `SELECT *
-  FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue} and 组件流水号 is  null`
+  FROM [质检管理_装配质检_查询视图] where 机床流水号 = ${this.machineValue1} and 组件流水号 is  null`
         }
       }).then(res => {
         this.tableDataDiv22 = res.data
@@ -3971,7 +4071,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `declare @机床流水号 int = ${this.machineValue}
+          name: `declare @机床流水号 int = ${this.machineValue1}
                   select 机床流水号,组号,组件名称,SUM(零件总数) as 零件总数,SUM(未制定零件数) as 未制定零件数,SUM(已制定零件数) as 已制定零件数 from (
                   --总
                   select 机床流水号,组号,组件名称
@@ -4071,7 +4171,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `declare @机床流水号 int = ${this.machineValue}
+          name: `declare @机床流水号 int = ${this.machineValue1}
                   select 机床流水号
                   ,a.组件流水号
                   ,组号
@@ -4190,7 +4290,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `declare @机床流水号 int = ${this.machineValue}
+          name: `declare @机床流水号 int = ${this.machineValue1}
                   create table #临时表1
                   (
                       id   int IDENTITY (1,1)     not null,
@@ -4317,7 +4417,7 @@ export default {
         method: 'post',
         data: {
           type: '3',
-          name: `select * from dbo.发货管理_发货单 where 机床流水号 = ${this.machineValue} and 是否发出 = 1`
+          name: `select * from dbo.发货管理_发货单 where 机床流水号 = ${this.machineValue1} and 是否发出 = 1`
         }
       }).then(res => {
         this.tableDataDiv23 = res.data
@@ -4331,17 +4431,17 @@ export default {
   .red{
     background: red;
   }
-  .yellow{
+  .jixingzhong{
     background: #7eaced;
     color: black;
     font-weight: bold;
   }
-  .green{
+  .yiwancheng{
     background: #ff9759;
     color: black;
     font-weight: bold;
   }
-  .white{
+  .weikaishi{
     background: #EAEAEA;
     color: black;
     font-weight: bold;
@@ -4370,7 +4470,7 @@ export default {
     width: 1858px;
     height: 400px;
     /*border: 1px solid red;*/
-    background: url('../../../assets/img/img10.png') repeat;
+    background: url('../../../assets/img/img12.png') repeat;
     background-repeat:no-repeat;
     background-size:100% 100%;-moz-background-size:100% 100%;
   }
diff --git a/src/views/Outsourcing/OutsourcingQCSearch/index.vue b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
index f8847075..b3d648f8 100644
--- a/src/views/Outsourcing/OutsourcingQCSearch/index.vue
+++ b/src/views/Outsourcing/OutsourcingQCSearch/index.vue
@@ -1,15 +1,13 @@
 <template>
   <div class="app-container">
     <el-card>
-      <div slot="header" class="header">
-        <span>外协到货单号:</span>
-        <el-input v-model="orderNumber" clearable style="width: 200px" size="small"/>
-        <span>外协厂家:</span>
-        <el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/>
-        <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
-      </div>
-      <el-table v-loading="" :data="tableData1" border style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
-        <el-table-column label="序号" align="center" width="80" type="index"/>
+      <span style="margin-left: 10px">外协到货单号:</span>
+      <el-input v-model="orderNumber" clearable style="width: 200px" size="small"/>
+      <span style="margin-left: 10px">外协厂家:</span>
+      <el-input v-model="outsourcingSupplier" clearable style="width: 200px" size="small"/>
+      <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=10;searchTable1()">查询</el-button>
+      <el-table v-loading="" :data="tableData1" border stripe style="width: 100%;max-height: 600px;" height="400px" size="mini" @row-click="searchTable2">
+        <el-table-column label="序号" align="center" width="55" type="index"/>
         <el-table-column label="外协到货单号" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.外协到货单编号 }}
@@ -37,34 +35,34 @@
           @size-change="handleSizeChange1"
           @current-change="handleCurrentChange1"/>
       </div>
-      <el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border style="width: 100%;min-height: 400px" height="400px" size="mini">
-        <el-table-column label="序号" align="center" width="80" type="index"/>
-        <el-table-column label="零件名称" align="center">
+      <el-table v-loading="" :data="tableData2" :summary-method="getSummaries" show-summary border stripe style="width: 100%;min-height: 400px" height="400px" size="mini">
+        <el-table-column label="序号" align="center" width="50px" type="index"/>
+        <el-table-column label="零件名称" align="center" min-width="70px">
           <template slot-scope="scope">
             {{ scope.row.零件名称 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件图号" align="center">
+        <el-table-column label="零件图号" align="center" min-width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
         </el-table-column>
-        <el-table-column label="零件数量" align="center">
+        <el-table-column label="零件数量" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.批次数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="质检人员" align="center">
+        <el-table-column label="质检人员" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.姓名 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验数量" align="center">
+        <el-table-column label="检验数量" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.数量 || 0 }}
           </template>
         </el-table-column>
-        <el-table-column label="不合格数量" align="center">
+        <el-table-column label="不合格数量" align="center" min-width="140px">
           <template slot-scope="scope">
             {{ scope.row.不合格数量 || 0 }}
           </template>
@@ -74,27 +72,27 @@
             {{ scope.row.不合格原因文本 }}
           </template>
         </el-table-column>
-        <el-table-column label="处理结果" align="center">
+        <el-table-column label="处理结果" align="center" width="70px">
           <template slot-scope="scope">
             {{ scope.row.不合格处理文本 }}
           </template>
         </el-table-column>
-        <el-table-column label="检验时间" align="center">
+        <el-table-column label="检验时间" align="center" min-width="135px">
           <template slot-scope="scope">
             {{ scope.row.操作时间 || '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="形位" align="center" width="100">
+        <el-table-column label="形位" align="center" width="90px">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini">
-                <el-table-column width="50" align="center" type="index" label="序号"/>
-                <el-table-column min-width="150" align="center" label="类别">
+              <el-table :data="gridData" highlight-current-row stripe size="mini">
+                <el-table-column width="50px" align="center" type="index" label="序号"/>
+                <el-table-column min-width="150px" align="center" label="类别">
                   <template slot-scope="scope">
                     {{ scope.row.类别 }}
                   </template>
                 </el-table-column>
-                <el-table-column min-width="100" align="center" label="数值">
+                <el-table-column min-width="100px" align="center" label="数值">
                   <template slot-scope="scope">
                     {{ scope.row.数值 }}
                   </template>
@@ -109,10 +107,10 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="尺寸" align="center" width="100">
+        <el-table-column label="尺寸" align="center" width="90px">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini">
+              <el-table :data="gridData" highlight-current-row stripe size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -134,10 +132,10 @@
             </el-popover>
           </template>
         </el-table-column>
-        <el-table-column label="外观" align="center" width="100">
+        <el-table-column label="外观" align="center" width="90px">
           <template slot-scope="scope">
             <el-popover placement="right" width="500" trigger="click">
-              <el-table :data="gridData" highlight-current-row size="mini">
+              <el-table :data="gridData" highlight-current-row stripe size="mini">
                 <el-table-column width="50" align="center" type="index" label="序号"/>
                 <el-table-column min-width="150" align="center" label="类别">
                   <template slot-scope="scope">
@@ -279,7 +277,4 @@ export default {
 </script>
 
 <style scoped>
-  .header span{
-    margin: 0 0 0 20px;
-  }
 </style>
diff --git a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
index 5cd7ac8e..0f3d9c22 100644
--- a/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
+++ b/src/views/PurchasingCenter/PurchaseContractApproval/index.vue
@@ -35,12 +35,13 @@
         v-loading="loading1"
         :data="tableData1"
         size="mini"
+        stripe
         border
-        style="width: 100%;max-height: 300px;"
-        height="300px"
+        style="width: 100%;max-height: 450px;"
+        height="450px"
         highlight-current-row
         @row-click="searchTable2">
-        <el-table-column type="expand">
+        <el-table-column label="展开" align="center" type="expand">
           <template slot-scope="scope">
             <el-form id="table" label-position="left" inline class="demo-table-expand">
               <el-row>
@@ -98,7 +99,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center" min-width="100" fixed="right">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
+            <el-button type="primary" size="mini" plain icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -117,7 +118,7 @@
 
     <div style="background-color:white;min-height:500px;margin: 0px auto;width:800px;border:1px solid black" v-html="returns"/>
 
-    <el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="370px">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="采购合同审批" center style="min-height: 300px;" width="370px">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="审批是否通过" prop="审批是否通过" center>
           <el-select v-model="form2.审批是否通过" size="small">
@@ -317,6 +318,9 @@ export default {
   .searchForm .el-form-item{
     margin-bottom: 5px;
   }
+  .el-card{
+    margin: 0px;
+  }
 </style>
 <style>
   #table .el-form-item {
diff --git a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
index 0ee9e0c3..7879b4d3 100644
--- a/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
+++ b/src/views/WorkshopProcurement/ProcurementContractApproval/index.vue
@@ -31,7 +31,7 @@
         size="mini"
         border
         style="width: 100%;max-height: 300px;"
-        height="300px"
+        height="450px"
         highlight-current-row
         @row-click="searchTable2">
         <el-table-column label="采购合同号" align="center">
@@ -49,7 +49,7 @@
             {{ scope.row.规定到货时间 }}
           </template>
         </el-table-column>
-        <el-table-column label="供应商" align="center">
+        <el-table-column label="供应商" align="center" min-width="200px">
           <template slot-scope="scope">
             {{ scope.row.供应商名称 }}
           </template>
@@ -71,7 +71,7 @@
         </el-table-column>
         <el-table-column label="操作" align="center">
           <template slot-scope="scope">
-            <el-button type="primary" size="mini" icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
+            <el-button type="primary" size="mini" plain icon="el-icon-edit-outline" @click="Open(scope.row)">审批</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -218,11 +218,12 @@
       </div>
     </el-card>
 
-    <el-dialog :visible.sync="dialogVisible2" title="采购员选择" center style="min-height: 300px;" width="40%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible2" title="采购员选择" center style="min-height: 300px;" width="40%">
       <el-table
         :data="tableData02"
-        size="small"
+        size="mini"
         border
+        stripe
         style="width: 100%;min-height:300px"
         height="300px"
         highlight-current-row
@@ -253,7 +254,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog :visible.sync="dialogVisible3" title="审批" center style="min-height: 300px;" width="20%">
+    <el-dialog v-el-drag-dialog :visible.sync="dialogVisible3" title="采购合同审批" center style="min-height: 300px;" width="30%">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="left" label-width="110px" class="demo-ruleForm">
         <el-form-item label="审批是否通过" prop="审批是否通过" center>
           <el-select v-model="form2.审批是否通过" size="small" @change="selectChange">
@@ -329,7 +330,7 @@ export default {
       ],
       disabled: true,
       form2: {
-        审批是否通过: '',
+        审批是否通过: '是',
         未通过原因: ''
       },
       rules2: {
@@ -510,6 +511,9 @@ export default {
   .searchForm .el-form-item{
     margin-bottom: 5px;
   }
+  .el-card{
+    margin: 0px;
+  }
 </style>
 <style>
   .tableData{