From fec631e2fcff7eb0afd4e078c59896bedcb3cd2f Mon Sep 17 00:00:00 2001
From: zhangdingyu <974548713@qq.com>
Date: Fri, 8 Nov 2019 17:48:09 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E5=90=88=E5=90=8C=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OfflineContract/index.vue                 | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/views/PurchasingCenter/OfflineContract/index.vue b/src/views/PurchasingCenter/OfflineContract/index.vue
index 7b79ead5..b5c9b39a 100644
--- a/src/views/PurchasingCenter/OfflineContract/index.vue
+++ b/src/views/PurchasingCenter/OfflineContract/index.vue
@@ -111,7 +111,7 @@
                   {{ scope.row.物料型号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="规格" align="center" prop="物料规格" min-width="150" show-overflow-tooltip>
+              <el-table-column label="规格" align="center" prop="物料规格" min-width="120" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.物料规格 }}
                 </template>
@@ -165,7 +165,7 @@
                   {{ Number(scope.row.零件类型) === 1 ? 'BZ' : 'WG' }}
                 </template>
               </el-table-column>
-              <el-table-column label="任务分配时间" prop="任务分配时间" align="center" min-width="120">
+              <el-table-column label="分配时间" prop="任务分配时间" align="center" min-width="120">
                 <template slot-scope="scope">
                   {{ scope.row.任务分配时间 ? (scope.row.任务分配时间.split(' ')[0] === '1900/1/4' ? '-' : scope.row.任务分配时间.split(' ')[0]) : '-' }}
                 </template>
@@ -289,7 +289,7 @@
         </el-tooltip>
         <el-input v-model="taxRate" style="float:right;width:100px" placeholder="税率" size="mini"/>
         <h4 style="float:right;width: 40px;margin: 5px">税率:</h4>
-        <el-button v-if="quickChangePrice" size="mini" style="float:right; width: 80px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
+        <el-button v-if="quickChangePrice" size="mini" style="float:right; width: 100px" @click="quickChangePrice=!quickChangePrice">快速修改价格</el-button>
         <el-button v-else size="mini" style="float:right;" @click="quickChangePrice=!quickChangePrice">还原</el-button>
       </div>
       <el-table v-loading="" :data="tableData2" border style="max-height: 460px;" size="mini" highlight-current-row @row-click="searchTable3">
@@ -363,11 +363,6 @@
       </div>
       <!--<h3>合同详细信息</h3>-->
       <el-table v-loading="" :data="tableData3" :summary-method="getSummaries" border style="max-height: 500px;" height="450px" size="mini" show-summary>
-        <!--        <el-table-column label="离线合同编号" align="center" width="110">-->
-        <!--          <template slot-scope="scope">-->
-        <!--            {{ scope.row.离线合同编号 }}-->
-        <!--          </template>-->
-        <!--        </el-table-column>-->
         <el-table-column label="物料名称" align="center" min-width="150" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.物料名称 ? scope.row.物料名称 : scope.row.零件名称 }}
@@ -405,7 +400,7 @@
             <b v-show="hasTax!=='未税'">{{ (scope.row.单价 / (1 + taxRate)).toFixed(2) }}</b>
           </template>
         </el-table-column>
-        <el-table-column label="单价(含税)" align="center" min-width="100" prop="单价">
+        <el-table-column label="单价(含税)" align="center" min-width="120" prop="单价">
           <template slot-scope="scope">
             <el-input v-direction="{x: 1, y: scope.$index}" v-if="hasTax==='含税'" v-model="scope.row.单价" :disabled="disable" size="mini" style="width:70px"/>
             <b v-show="hasTax!=='含税'">{{ (scope.row.未税单价 * (1 + taxRate)).toFixed(2) }}</b>
@@ -421,13 +416,13 @@
             {{ hasTax==='含税' ? scope.row.含税总额 = (Number(scope.row.数量) * Number(scope.row.单价)).toFixed(2) : scope.row.含税总额 = (scope.row.未税总额 * (1+taxRate)).toFixed(2) }}
           </template>
         </el-table-column>
-        <el-table-column label="备注" align="center" min-width="160" prop="备注">
+        <el-table-column label="备注" align="center" min-width="120" prop="备注">
           <template slot-scope="scope">
             <el-input v-direction="{x: 3, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.备注" :disabled="disable" size="mini" style="width:120px"/>
             <b v-else>{{ scope.row.备注 || '—' }}</b>
           </template>
         </el-table-column>
-        <el-table-column label="交货期要求" align="center" min-width="130" prop="交货期要求">
+        <el-table-column label="交货期" align="center" min-width="130" prop="交货期要求">
           <template slot-scope="scope">
             <el-input v-direction="{x: 2, y: scope.$index}" v-if="quickChangePrice" v-model="scope.row.交货期要求" :disabled="disable" size="mini" style="width:90px"/>
             <b v-else>{{ scope.row.交货期要求 || '—' }}</b>
@@ -438,9 +433,10 @@
             {{ scope.row.到货数量 }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" min-width="100">
+        <el-table-column label="操作" align="center" min-width="50">
           <template slot-scope="scope">
-            <el-button v-if="quickChangePrice" :disabled="disable" type="danger" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)">移除</el-button>
+            <!--<el-button :disabled="arrival(scope.row)" type="text" icon="el-icon-delete" plain size="mini" @click="deleteOfflineContract(scope.row)"/>-->
+            <el-button v-if="quickChangePrice" :disabled="disable" type="text" plain size="mini" icon="el-icon-delete" @click="deleteMateriel(scope.row)"/>
             <b v-else>移除</b>
           </template>
         </el-table-column>