Merge branch 'master' of http://192.168.0.149:10010/r/高精2.0

src/views/ManufacturingCenter/ParseQuery/index.vue

@@ -5,133 +5,134 @@
         <div class="process" @click.stop="chaxun">
           <div id="son" :class="[isActive ? color[22] : 'weikaishi']" class="module" style="position: relative;left: 1588px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：装配部<br>根据营销部门发出发货请求，<br>装配部进行发货</div>
+              <div slot="content">单击查看发货详情</div>
               <el-button :disabled="disabled" :class="[isActive ? color[22] : 'weikaishi']" type="text" @click.stop="searchDiv23">发货</el-button>
             </el-tooltip>
           </div>
           <div id="son1" :class="[isActive ? color[21] : 'weikaishi']" class="module" style="position: relative;left: 1400px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：质检部<br>对机床进行总装调试</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试</el-button>
+              <div slot="content">总装开始时间：{{ `${data2[0].总装调试}` }}<br>总装结束时间：{{ `${data2[0].机床装配实际完成时间}` }}</div>
+              <el-button v-if="data2[0].总装调试状态===2" :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].机床装配实际完成时间}` }}</el-button>
+              <el-button v-else :disabled="disabled" :class="[isActive ? color[21] : 'weikaishi']" type="text" @click.stop="searchDiv22">总装调试<br>{{ `${data2[0].总装调试}` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son2" :class="[isActive ? color[20] : 'weikaishi']" class="module" style="position: relative;left: 1210px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：质检部<br>对机床重要部件进行检测</div>
+              <div slot="content">装配质检合格率：{{ `${data2[0].装配质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[20] : 'weikaishi']" type="text" @click.stop="searchDiv21">装配质检<br>{{ `${data2[0].装配质检}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son3" :class="[isActive ? color[19] : 'weikaishi']" class="module" style="position: relative;left: 1005px;top:62px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：电气部<br>电气部长制定装配计划，<br>并记录计划执行情况</div>
+              <div slot="content">电气装配计划完成率：{{ `${data2[0].电气装配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[19] : 'weikaishi']" type="text" @click.stop="searchDiv6">电气装配<br>{{ `${data2[0].电气装配}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son4" :class="[isActive ? color[18] : 'weikaishi']" class="module" style="position: relative;left: 920px;top:140px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content"><br>角色：装配部长<br>装配部长制定装配计划，<br>并记录计划执行情况</div>
+              <div slot="content">机械装配计划完成率：{{ `${data2[0].机械装配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[18] : 'weikaishi']" type="text" @click.stop="searchDiv5">机械装配<br>{{ `${data2[0].机械装配}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son5" :class="[isActive ? color[17] : 'weikaishi']" class="module" style="position: relative;left: 835px;top:220px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：冷作车间主任<br>冷作车间主任制定冷作计划，<br>并记录计划执行情况</div>
+              <div slot="content">冷作计划完成率：{{ `${data2[0].冷作}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[17] : 'weikaishi']" type="text" @click.stop="searchDiv7">冷作<br>{{ `${data2[0].冷作}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son6" :class="[isActive ? color[16] : 'weikaishi']" class="module" style="position: relative;left: 750px;top:300px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：油漆车间主任<br>油漆车间主任制定装配计划，<br>并记录计划执行情况</div>
+              <div slot="content">油漆计划完成率：{{ `${data2[0].油漆}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[16] : 'weikaishi']" type="text" @click.stop="searchDiv8">油漆<br>{{ `${data2[0].油漆}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son7" :class="[isActive ? color[15] : 'weikaishi']" class="module" style="position: relative;left: 544px;top:190px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：装配部长<br>此模块用于查询某机床是否达到装配条件，<br>即采购件与自制件是否成组配套</div>
+              <div slot="content">成组配套率：{{ `${data2[0].成组配套}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[15] : 'weikaishi']" type="text" @click.stop="searchDiv9">成组配套<br>{{ `${data2[0].成组配套}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son8" :class="[isActive ? color[14] : 'weikaishi']" class="module" style="position: relative;left: 321px;top:95px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：质检部<br>对自制件进行检测</div>
+              <div slot="content">自制质检合格率：{{ `${data2[0].自制质检}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[14] : 'weikaishi']" type="text" @click.stop="searchDiv12">自制质检<br>{{ `${data2[0].自制质检}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son9" :class="[isActive ? color[13] : 'weikaishi']" class="module" style="position: relative;left: 240px;top:286px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：质检部<br>对采购件进行检测</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检}%` }}</el-button>
+              <div slot="content">采购质检合格率：{{ `${data2[0].采购质检}%` }}</div>
+              <el-button :disabled="disabled" :class="[isActive ? color[13] : 'weikaishi']" type="text" @click.stop="searchDiv19">采购质检<br>{{ `${data2[0].采购质检 === 0 ? data2[0].采购质检 : '-'}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son10" :class="[isActive ? color[12] : 'weikaishi']" class="module" style="position: relative;left: 30px;top:155px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：金工车间<br>接收加工任务并使用<br>MES工作站进行报工</div>
+              <div slot="content">车间加工计划完成率：{{ `${data2[0].车间加工}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[12] : 'weikaishi']" type="text" @click.stop="searchDiv10">车间加工<br>{{ `${data2[0].车间加工}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son11" :class="[isActive ? color[11] : 'weikaishi']" class="module" style="position: relative;left: -133px;top:33px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：外协员<br>进行外协加工</div>
+              <div slot="content">外协计划完成率：{{ `${data2[0].外协}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[11] : 'weikaishi']" type="text" @click.stop="searchDiv18">工序外协<br>{{ `${data2[0].外协}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son12" :class="[isActive ? color[10] : 'weikaishi']" class="module" style="position: relative;left: -335px;top:94px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：计划员<br>针对做完工艺定额的零件进行排查</div>
+              <div slot="content">能力平衡计划完成率：{{ `${data2[0].能力平衡}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[10] : 'weikaishi']" type="text" @click.stop="searchDiv15">能力平衡<br>{{ `${data2[0].能力平衡}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son14" :class="[isActive ? color[8] : 'weikaishi']" class="module" style="position: relative;left: -520px;top:93px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：工艺部<br>制定零件工艺定额</div>
+              <div slot="content">工艺定额计划完成率：{{ `${data2[0].工艺定额}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[8] : 'weikaishi']" type="text" @click.stop="searchDiv13">工艺定额<br>{{ `${data2[0].工艺定额}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son15" :class="[isActive ? color[7] : 'weikaishi']" class="module" style="position: relative;left: -728px;top:33px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：下料员<br>对于钢板等自家备料<br>下料员需要在系统确认备料<br>并通知金工领料</div>
+              <div slot="content">自家备料计划完成率：{{ `${data2[0].自家备料}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[7] : 'weikaishi']" type="text" @click.stop="searchDiv11">自家备料<br>{{ `${data2[0].自家备料}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son16" :class="[isActive ? color[0] : 'weikaishi']" class="module" style="position: relative;left: -1255px;top:236px; width: 80px;height: 48px;">
-            <!--<el-tooltip placement="top">-->
-            <!--<div slot="content">角色：营销内勤<br>负责创建项目及机床的基础信息，<br>此部分作为系统数据的源头</div>-->
-            <!--</el-tooltip>-->
-            <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
+            <el-tooltip :open-delay="600" placement="top">
+              <div slot="content">回款进度：{{ `${data2[0].签订合同}%` }}</div>
+              <el-button :disabled="disabled" :class="[isActive ? color[0] : 'weikaishi']" type="text" @click.stop="searchDiv1">签订合同<br>{{ `${data2[0].签订合同}%` }}</el-button>
+            </el-tooltip>
           </div>
           <div id="son17" :class="[isActive ? color[1] : 'weikaishi']" class="module" style="position: relative;left: -1240px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：技术员<br>负责导入三表(零件)，<br>组件在项目启动会时提出，<br>由制造总监导入</div>
+              <div slot="content">产品设计计划完成率：{{ `${data2[0].产品设计}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[1] : 'weikaishi']" type="text" @click.stop="searchDiv2">产品设计<br>{{ `${data2[0].产品设计}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son18" :class="[isActive ? color[6] : 'weikaishi']" class="module" style="position: relative;left: -980px;top:155px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：下料员<br>外购物料到货后，由下料员确认备料，<br>并通知金工领料</div>
+              <div slot="content">外购备料计划完成率：{{ `${data2[0].外购备料}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[6] : 'weikaishi']" type="text" @click.stop="searchDiv20">外购备料<br>{{ `${data2[0].外购备料}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son19" :class="[isActive ? color[2] : 'weikaishi']" class="module" style="position: relative;left: -1311px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：计划员<br>计划员负责将三表中的零件按实际情况分配为：<br>自制件、采购部采购件、制造部采购件三类</div>
+              <div slot="content">零件分配计划完成率：{{ `${data2[0].零件分配}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[2] : 'weikaishi']" type="text" @click.stop="searchDiv3">零件分配<br>{{ `${data2[0].零件分配}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son20" :class="[isActive ? color[3] : 'weikaishi']" class="module" style="position: relative;left: -1269px;top:103px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：计划员<br>计划员分配零件后，<br>在生产计划下达模块<br>可查看到自家加工的零件任务，<br>计划员需要将这些零件投产</div>
-              <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制件<br>{{ `${data2[0].自制件}%` }}</el-button>
+              <div slot="content">自制投产计划完成率：{{ `${data2[0].自制件}%` }}</div>
+              <el-button :disabled="disabled" :class="[isActive ? color[3] : 'weikaishi']" type="text" @click.stop="searchDiv4">自制投产<br>{{ `${data2[0].自制件}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son21" :class="[isActive ? color[5] : 'weikaishi']" class="module" style="position: relative;left: -1354px;top:236px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：制造部长<br>计划员分配零件后，<br>将分配到制造部的采购件进行采购</div>
+              <div slot="content">采购计划完成率：{{ `${data2[0].车间采购}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[5] : 'weikaishi']" type="text" @click.stop="searchDiv17">车间采购<br>{{ `${data2[0].车间采购}%` }}</el-button>
             </el-tooltip>
           </div>
           <div id="son22" :class="[isActive ? color[4] : 'weikaishi']" class="module" style="position: relative;left: -1438px;top:328px; width: 80px;height: 48px;">
             <el-tooltip :open-delay="600" placement="top">
-              <div slot="content">角色：采购部<br>计划员分配零件后，<br>将分配到采购部的采购件进行采购</div>
+              <div slot="content">采购计划完成率：{{ `${data2[0].采购部采购}%` }}</div>
               <el-button :disabled="disabled" :class="[isActive ? color[4] : 'weikaishi']" type="text" @click.stop="searchDiv16">采购部采购<br>{{ `${data2[0].采购部采购}%` }}</el-button>
             </el-tooltip>
           </div>
@@ -217,7 +218,8 @@
     <!--签订合同-->
     <div v-show="showDiv1">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 签订合同</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6">
               <div style="margin:0 auto; width:400px; height:100px;margin-top: 70px">
@@ -309,7 +311,8 @@
     <!--产品设计-->
     <div v-show="showDiv2">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 产品设计</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -355,17 +358,17 @@
                     {{ scope.row.任务名称 ? scope.row.任务名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="计划开始时间">
+                <el-table-column align="center" label="设计计划开始时间">
                   <template slot-scope="scope">
                     {{ scope.row.任务开始时间.substring(0, 11) }}
                   </template>
                 </el-table-column>
-                <el-table-column label="计划完成时间" align="center">
+                <el-table-column label="设计计划完成时间" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.计划完成时间.substring(0, 11) }}
                   </template>
                 </el-table-column>
-                <el-table-column label="实际完成时间" align="center">
+                <el-table-column label="设计实际完成时间" align="center">
                   <template slot-scope="scope">
                     {{ scope.row.实际完成时间 ? scope.row.实际完成时间 : '--' }}
                   </template>
@@ -384,7 +387,8 @@
     <!--零件分配-->
     <div v-show="showDiv3">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 零件分配</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -461,7 +465,8 @@
     <!--自制件-->
     <div v-show="showDiv4">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 自制投产</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -526,7 +531,8 @@
     <!--机械装配-->
     <div v-show="showDiv5">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 机械装配</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -595,7 +601,8 @@
     <!--电气装配-->
     <div v-show="showDiv6">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 电气装配</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -664,7 +671,8 @@
     <!--冷作计划-->
     <div v-show="showDiv7">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 冷作</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -733,7 +741,8 @@
     <!--油漆计划-->
     <div v-show="showDiv8">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 油漆</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -802,7 +811,8 @@
     <!--成组配套-->
     <div v-show="showDiv9">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 成组配套</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <h3>加工完成</h3>
@@ -950,7 +960,8 @@
     <!--车间加工-->
     <div v-show="showDiv10">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 车间加工</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <div id="barDiv10" style="width:600px;height:400px; display: block; float: left"/>
@@ -1017,7 +1028,8 @@
     <!--自家备料-->
     <div v-show="showDiv11">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 自家备料</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <div id="barDiv11" style="width:600px;height:350px; display: block; float: left"/>
@@ -1074,7 +1086,8 @@
     <!--自制件质检-->
     <div v-show="showDiv12">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 自制件质检</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="24">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
@@ -1117,7 +1130,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="合格率">
                   <template slot-scope="scope">
-                    <el-tag size="mini" style="width: 80px">{{ scope.row.合格率 ? scope.row.合格率 * 100 + '%' : '--' }}</el-tag>
+                    <el-tag size="mini" style="width: 80px">{{ scope.row.合格率 ? scope.row.合格率 + '%' : '--' }}</el-tag>
                   </template>
                 </el-table-column>
               </el-table>
@@ -1126,10 +1139,11 @@
         </el-row>
       </el-card>
     </div>
-    <!--工艺-->
+    <!--工艺定额-->
     <div v-show="showDiv13">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 工艺定额</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <div id="barDiv13" style="width:600px;height:350px; display: block; float: left"/>
@@ -1244,7 +1258,8 @@
     <!--能力平衡-->
     <div v-show="showDiv15">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 能力平衡</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <div id="barDiv15" style="width:600px;height:350px; display: block; float: left"/>
@@ -1301,7 +1316,8 @@
     <!--发货-->
     <div v-show="showDiv23">
       <el-card class="showDiv">
-        <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
+        <h3 style="align-content: center">{{ Machine }} : 发货</h3>
+        <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center;margin-top: 10px">
           <el-table
             :data="tableDataDiv23"
             height="340"
@@ -1372,7 +1388,8 @@
     <!--采购部采购-->
     <div v-show="showDiv16">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 采购部采购</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <h3>外购件</h3>
@@ -1511,7 +1528,8 @@
     <!--车间采购-->
     <div v-show="showDiv17">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 车间采购</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="12">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
@@ -1604,7 +1622,8 @@
     <!--工序外协-->
     <div v-show="showDiv18">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 工序外协</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="8">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-row>
@@ -1668,7 +1687,8 @@
     <!--采购质检-->
     <div v-show="showDiv19">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 采购质检</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="24">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
@@ -1711,7 +1731,7 @@
                 </el-table-column>
                 <el-table-column align="center" label="合格率">
                   <template slot-scope="scope">
-                    <el-tag size="mini" style="width: 80px">{{ scope.row.合格率 ? scope.row.合格率 * 100 + '%' : '--' }}</el-tag>
+                    <el-tag size="mini" style="width: 80px">{{ scope.row.合格率 ? scope.row.合格率 + '%' : '--' }}</el-tag>
                   </template>
                 </el-table-column>
               </el-table>
@@ -1723,7 +1743,8 @@
     <!--外购备料-->
     <div v-show="showDiv20">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 外购备料</h3>
+        <el-row style="margin-top: 10px">
           <el-col :span="24">
             <div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">
               <el-table
@@ -1779,7 +1800,8 @@
     <!--装配质检-->
     <div v-show="showDiv21">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 装配质检</h3>
+        <el-row style="margin-top: 10px">
           <!--<el-col :span="8">-->
           <!--<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">-->
           <!--<div id="barDiv11" style="width:600px;height:350px; display: block; float: left"/>-->
@@ -1850,7 +1872,8 @@
     <!--总装调试-->
     <div v-show="showDiv22">
       <el-card class="showDiv">
-        <el-row>
+        <h3 style="align-content: center">{{ Machine }} : 总装调试</h3>
+        <el-row style="margin-top: 10px">
           <!--<el-col :span="8">-->
           <!--<div class="grid-content bg-purple" style="width: 99%; height: 340px; border: 1px solid #DCDFE6;text-align: center">-->
           <!--<div id="barDiv11" style="width:600px;height:350px; display: block; float: left"/>-->
@@ -1881,7 +1904,7 @@
                     {{ scope.row.机床名称 ? scope.row.机床名称 : '--' }}
                   </template>
                 </el-table-column>
-                <el-table-column align="center" label="总装开始时间" width="150px">
+                <el-table-column align="center" label="总装开始时间">
                   <template slot-scope="scope">
                     {{ scope.row.机床装配实际开始时间 ? scope.row.机床装配实际开始时间 : '--' }}
                   </template>
@@ -1919,6 +1942,7 @@ export default {
   data() {
     return {
       Purchase: '',
+      Machine: '',
       WorkPurchase: '',
       Outsourcing: '',
       Home: '',
@@ -2324,6 +2348,7 @@ export default {
     async handleSelect(row) {
       // 在此方法中可以把下拉框选中值中的内容赋值给其他变量使用
       this.machineValue1 = row.机床流水号
+      this.Machine = row.机床图号
       this.machineValue1 ? this.disabled = false : this.disabled = true
       this.showDiv1 = false
       this.showDiv2 = false
@@ -2349,6 +2374,26 @@ export default {
       this.showDiv0 = true
       await searchAll(this.machineValue1).then(response => {
         this.isActive = true
+        if (response.data[0].自制质检 === '') {
+          response.data[0].自制质检 = '-'
+        }
+        if (response.data[0].采购质检 === '') {
+          response.data[0].采购质检 = '-'
+        }
+        if (response.data[0].装配质检 === '') {
+          response.data[0].装配质检 = '-'
+        }
+        if (response.data[0].总装调试 === '1900-01-01 00:00:00.000') {
+          response.data[0].总装调试 = '-'
+        } else {
+          response.data[0].总装调试 = response.data[0].总装调试.split(' ')[0]
+        }
+        console.log(response.data[0].机床装配实际完成时间, 123)
+        if (response.data[0].机床装配实际完成时间 === '1900-01-01 00:00:00') {
+          response.data[0].机床装配实际完成时间 = '-'
+        } else {
+          response.data[0].机床装配实际完成时间 = response.data[0].机床装配实际完成时间.split(' ')[0]
+        }
         this.data2 = response.data
         if (response.data[0].签订合同 === 0) { this.color[0] = 'weikaishi' } else if (response.data[0].签订合同 !== 0 && response.data[0].签订合同 !== 100) { this.color[0] = 'jixingzhong' } else if (response.data[0].签订合同 === 100) { this.color[0] = 'yiwancheng' }
         if (response.data[0].产品设计 === 0) { this.color[1] = 'weikaishi' } else if (response.data[0].产品设计 !== 0 && response.data[0].产品设计 !== 100) { this.color[1] = 'jixingzhong' } else if (response.data[0].产品设计 === 100) { this.color[1] = 'yiwancheng' }
@@ -2362,16 +2407,16 @@ export default {
         if (response.data[0].能力平衡 === 0) { this.color[10] = 'weikaishi' } else if (response.data[0].能力平衡 !== 0 && response.data[0].能力平衡 !== 100) { this.color[10] = 'jixingzhong' } else if (response.data[0].能力平衡 === 100) { this.color[10] = 'yiwancheng' }
         if (response.data[0].外协 === 0) { this.color[11] = 'weikaishi' } else if (response.data[0].外协 !== 0 && response.data[0].外协 !== 100) { this.color[11] = 'jixingzhong' } else if (response.data[0].外协 === 100) { this.color[11] = 'yiwancheng' }
         if (response.data[0].车间加工 === 0) { this.color[12] = 'weikaishi' } else if (response.data[0].车间加工 !== 0 && response.data[0].车间加工 !== 100) { this.color[12] = 'jixingzhong' } else if (response.data[0].车间加工 === 100) { this.color[12] = 'yiwancheng' }
-        if (response.data[0].采购质检 === 0) { this.color[13] = 'weikaishi' } else if (response.data[0].采购质检 !== 0 && response.data[0].采购质检 !== 100) { this.color[13] = 'jixingzhong' } else if (response.data[0].采购质检 === 100) { this.color[13] = 'yiwancheng' }
-        if (response.data[0].自制质检 === 0) { this.color[14] = 'weikaishi' } else if (response.data[0].自制质检 !== 0 && response.data[0].自制质检 !== 100) { this.color[14] = 'jixingzhong' } else if (response.data[0].自制质检 === 100) { this.color[14] = 'yiwancheng' }
+        if (response.data[0].采购质检 === '-') { this.color[13] = 'weikaishi' } else { this.color[13] = 'jixingzhong' }
+        if (response.data[0].自制质检 === '-') { this.color[14] = 'weikaishi' } else { this.color[14] = 'jixingzhong' }
         if (response.data[0].成组配套 === 0) { this.color[15] = 'weikaishi' } else if (response.data[0].成组配套 !== 0 && response.data[0].成组配套 !== 100) { this.color[15] = 'jixingzhong' } else if (response.data[0].成组配套 === 100) { this.color[15] = 'yiwancheng' }
         if (response.data[0].油漆 === 0) { this.color[16] = 'weikaishi' } else if (response.data[0].油漆 !== 0 && response.data[0].油漆 !== 100) { this.color[16] = 'jixingzhong' } else if (response.data[0].油漆 === 100) { this.color[16] = 'yiwancheng' }
         if (response.data[0].冷作 === 0) { this.color[17] = 'weikaishi' } else if (response.data[0].冷作 !== 0 && response.data[0].冷作 !== 100) { this.color[17] = 'jixingzhong' } else if (response.data[0].冷作 === 100) { this.color[17] = 'yiwancheng' }
         if (response.data[0].机械装配 === 0) { this.color[18] = 'weikaishi' } else if (response.data[0].机械装配 !== 0 && response.data[0].机械装配 !== 100) { this.color[18] = 'jixingzhong' } else if (response.data[0].机械装配 === 100) { this.color[18] = 'yiwancheng' }
         if (response.data[0].电气装配 === 0) { this.color[19] = 'weikaishi' } else if (response.data[0].电气装配 !== 0 && response.data[0].电气装配 !== 100) { this.color[19] = 'jixingzhong' } else if (response.data[0].电气装配 === 100) { this.color[19] = 'yiwancheng' }
-        if (response.data[0].装配质检 === 0) { this.color[20] = 'weikaishi' } else if (response.data[0].装配质检 !== 0 && response.data[0].装配质检 !== 100) { this.color[20] = 'jixingzhong' } else if (response.data[0].装配质检 === 100) { this.color[20] = 'yiwancheng' }
-        if (response.data[0].总装调试 === 0) { this.color[21] = 'weikaishi' } else if (response.data[0].总装调试 !== 0 && response.data[0].总装调试 !== 100) { this.color[21] = 'jixingzhong' } else if (response.data[0].总装调试 === 100) { this.color[21] = 'yiwancheng' }
-        if (response.data[0].发货 === 0) { this.color[22] = 'weikaishi' } else if (response.data[0].发货 !== 0 && response.data[0].发货 !== 100) { this.color[22] = 'jixingzhong' } else if (response.data[0].发货 === 100) { this.color[22] = 'yiwancheng' }
+        if (response.data[0].装配质检 === '-') { this.color[20] = 'weikaishi' } else { this.color[20] = 'jixingzhong' }
+        if (response.data[0].总装调试状态 === 0) { this.color[21] = 'weikaishi' } else if (response.data[0].总装调试状态 === 1) { this.color[21] = 'jixingzhong' } else if (response.data[0].总装调试状态 === 2) { this.color[21] = 'yiwancheng' }
+        if (response.data[0].发货状态 === 0) { this.color[22] = 'weikaishi' } else if (response.data[0].发货状态 === 1) { this.color[22] = 'jixingzhong' } else if (response.data[0].发货状态 === 2) { this.color[22] = 'yiwancheng' }
       })
     },
     // 查询签订合同div数据
@@ -2484,7 +2529,7 @@ export default {
           method: 'post',
           data: {
             type: '3',
-            name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue1}`
+            name: `select count(*) from PDM_组件名称 where 机床流水号=${this.machineValue1} and 组号 <> '00组'`
           }
         }).then(res => {
           this.dataDiv2.组件总数 = res.data[0].Column1
@@ -2622,7 +2667,7 @@ export default {
                 left join (select 组件流水号,count(*) as 外购件个数
                 from PDM_零件明细表_标准件和外购件 group by 组件流水号) as b on 综合查询_零件分配模块信息视图.组件流水号 = b.组件流水号
                 left join (select 组件流水号,count(*) as 基本件未分配个数
-                from PDM_零件明细表_基本件 where 是否采购 = 0 and 是否传递 = 0 group by 组件流水号) as c on 综合查询_零件分配模块信息视图.组件流水号 = c.组件流水号
+                from PDM_零件明细表_基本件 where 是否采购 = 0 and 是否传递 = 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.machineValue1} and 组号 <> '00组' order by 组号`
@@ -3606,8 +3651,7 @@ export default {
                   ,sum([数量]) as 检测总数量
                   ,sum([不合格数量]) as 不合格总数量
                   ,sum([批次数量]) as 零件总数量
-               ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
-                  ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
+                 ,Convert(decimal(18,2),100 * (sum(isNull([数量],0))-sum(isNull([不合格数量],0)))/sum(isNull([数量],0))) as 合格率
               FROM [质检管理_基本件数据_查询视图] where 机床流水号 = ${this.machineValue1}
               group by 组号, 组件名称 order by 组号`
         }
@@ -3911,8 +3955,7 @@ export default {
             ,sum([数量]) as 检测总数量
             ,sum([不合格数量]) as 不合格总数量
             ,sum([零件数量]) as 零件总数量
-            ,isnull(sum([不合格数量])/sum([数量]), 0) as 不合格率
-            ,1 - isNull(sum([不合格数量])/sum([数量]), 0) as 合格率
+            ,Convert(decimal(18,2),100*(sum(isNull([数量],0))-sum(isNull([不合格数量],0)))/sum(isNull([数量],0))) as 合格率
             FROM (
             select 组号,组件名称,数量,不合格数量,零件数量 from 质检管理_外购件制造部数据_查询视图 where 机床流水号 = ${this.machineValue1}
             union
@@ -4486,7 +4529,7 @@ export default {
     margin: 0;
   }
   .showDiv{
-    height: 380px;
+    height: 420px;
   }
   .el-button{
     padding-top: 5px;

src/views/ManufacturingCenter/PartAssignment/index.vue

@@ -99,6 +99,11 @@
                 {{ scope.row.零件备注 }}
               </template>
             </el-table-column>
+            <el-table-column label="操作" align="center" width="100px" fixed="right">
+              <template slot-scope="scope">
+                <el-button type="danger" size="mini" icon="el-icon-delete" plain @click="OutParts(scope.row)">移出</el-button>
+              </template>
+            </el-table-column>
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="外购件">
@@ -584,7 +589,7 @@
 </template>
 
 <script>
-import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum } from '@/api/ManufacturingCenter/PartAssignment'
+import { initProject, searchgroup, searchTable, searchPart, searchPart1, searchTable1, addData, editData, deleteData, searchDetailed, searchDetailed1, purchaseRequisition, purchaseRequisition1, purchaseRequisition2, MoveOut, MoveOut1, PurchasingDepartment, Production, PartCallbackInformation, PartCallbackInformation1, submit, submit1, Delete, Delete1, editStock, editNum, OutPart } from '@/api/ManufacturingCenter/PartAssignment'
 import { mapGetters } from 'vuex'
 import Cookie from 'js-cookie'
 export default {
@@ -1022,6 +1027,27 @@ export default {
         })
       })
     },
+    OutParts(row) { // 移出数据
+      this.$confirm('移出后，该零件将不再参与考核', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        OutPart(row.基本件流水号).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('移出成功')
+            searchPart(this.groupFloatValue).then(response => {
+              this.tableData1 = response.data
+            })
+          } else { this.$message.error('移出失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
+    },
     cancel(formName) {
       this.form = {}
       this.dialogFormVisible = false