From ca88f500227f87b47015ac6f23d472fe4d3eaf28 Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Wed, 4 Dec 2019 16:19:07 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E7=BB=84=E4=BB=B6=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompletionOfWorkshopComponents/index.vue  | 18 ++++-
 .../ContractCapitalManagement/index.vue       | 74 ++++++-------------
 2 files changed, 35 insertions(+), 57 deletions(-)

diff --git a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
index 76e64941..c9df30d8 100644
--- a/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
+++ b/src/views/ManufacturingCenter/CompletionOfWorkshopComponents/index.vue
@@ -20,9 +20,9 @@
       </el-select>
     </el-card>
     <el-row>
-      <el-col style="width: 450px">
+      <el-col :span="8">
         <el-card>
-          <el-table :data="tableData1" style="height: 670px" highlight-current-row border>
+          <el-table :data="tableData1" :row-class-name="tableRowClassName" style="height: 670px" highlight-current-row border>
             <el-table-column align="center" label="工序名" width="110">
               <template slot-scope="scope">
                 {{ scope.row.工艺名称 }}
@@ -46,9 +46,9 @@
           </el-table>
         </el-card>
       </el-col>
-      <el-col style="width:1000px">
+      <el-col :span="16">
         <el-card>
-          <span>机床图号：{{ 机床图号 }} 机床名称：{{ 机床名称 }}</span>
+          <span style="background-color: rgb(126,172,237);font-size: 20px">{{ 机床图号 }}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{ 机床名称 }}</span>
           <div style="margin: 10px 0 0 20px;height: 650px;overflow: auto">
             <el-tree
               :data="departmentData"
@@ -221,11 +221,21 @@ export default {
       selectProcedure(row.工艺计划流水号).then(response => {
         this.tableData1 = response.data
       })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (row.工序状态 === 4) {
+        return 'cjzuwcqk_complet'
+      }
     }
   }
 }
 </script>
 
+<style>
+  .el-table .cjzuwcqk_complet {
+    background: #67C23A;
+  }
+</style>
 <style lang="scss">
   .selectTree{
     .el-tree-node__content>.el-tree-node__expand-icon{
diff --git a/src/views/MarketingCenter/ContractCapitalManagement/index.vue b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
index fc0f21bf..399023c4 100644
--- a/src/views/MarketingCenter/ContractCapitalManagement/index.vue
+++ b/src/views/MarketingCenter/ContractCapitalManagement/index.vue
@@ -88,49 +88,7 @@
               {{ scope.row.姓名 }}
             </template>
           </el-table-column>
-          <!--        <el-table-column align="center" label="已完成进度" width="90">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ scope.row.执行进度名 }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="已到账金额（万元）" width="130">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ Number(scope.row.已支付).toFixed(2) }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="未到账金额（万元）" width="130">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <el-tag size="mini" style="width: 100px" type="warning">{{ Number(scope.row.未支付金额).toFixed(2) }}</el-tag>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="付款进度" width="150">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            <div style="width: 130px">-->
-          <!--              <el-progress :text-inside="true" :stroke-width="18" :percentage="parseFloat(scope.row.付款百分比)" size="mini" status="success" />-->
-          <!--            </div>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="联系人" width="60">-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ scope.row.联系人 }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="联系电话" width="100" show-overflow-tooltip>-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ scope.row.电话 }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="银行账号" width="80" show-overflow-tooltip>-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ scope.row.银行账号 }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <!--        <el-table-column align="center" label="税号" show-overflow-tooltip>-->
-          <!--          <template slot-scope="scope">-->
-          <!--            {{ scope.row.税号 }}-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <el-table-column label="操作" align="center" width="60">
+          <el-table-column label="操作" align="center" width="60" fixed="right">
             <template slot-scope="scope">
               <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
                 <div style="display: inline-block">
@@ -142,16 +100,26 @@
                     @click.stop="EditTableData(scope.row)"/>
                 </div>
               </el-tooltip>
-              <!--            <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
-              <!--              <div style="display: inline-block">-->
-              <!--                <el-button-->
-              <!--                  style="margin-left: 20px"-->
-              <!--                  size="mini"-->
-              <!--                  type="text"-->
-              <!--                  icon="el-icon-delete"-->
-              <!--                  @click.stop="dellist(scope.row)"/>-->
-              <!--              </div>-->
-              <!--            </el-tooltip>-->
+              <el-tooltip :open-delay="1000" effect="dark" content="新增发票" placement="top">
+                <div style="display: inline-block">
+                  <el-button
+                    :disabled="scope.row.是否禁用编辑"
+                    type="text"
+                    size="mini"
+                    icon="el-icon-circle-plus-outline"
+                    @click.stop="EditTableData(scope.row)"/>
+                </div>
+              </el-tooltip>
+              <!--<el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">-->
+              <!--<div style="display: inline-block">-->
+              <!--<el-button-->
+              <!--style="margin-left: 20px"-->
+              <!--size="mini"-->
+              <!--type="text"-->
+              <!--icon="el-icon-delete"-->
+              <!--@click.stop="dellist(scope.row)"/>-->
+              <!--</div>-->
+              <!--</el-tooltip>-->
             </template>
           </el-table-column>
         </el-table>