From c5bc4b54db9d66533f3a85a9a2bc1d04601e8a92 Mon Sep 17 00:00:00 2001
From: Vergil <974548713@qq.com>
Date: Tue, 19 May 2020 10:11:22 +0800
Subject: [PATCH] a

---
 .../CreatePreparationBill/index.vue           | 44 ++++------
 .../MonthEndHourAccounting/index.vue          | 34 +++-----
 .../CreatingPurchasingMaterials/index.vue     | 86 +++++++------------
 src/views/layout/components/TagsView.vue      |  6 +-
 4 files changed, 64 insertions(+), 106 deletions(-)

diff --git a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
index f2011b65..fc9b7f5f 100644
--- a/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
+++ b/src/views/ManufacturingCenter/CreatePreparationBill/index.vue
@@ -1,32 +1,22 @@
 <template>
   <div>
-    <div style="width: 1900px;overflow:auto">
-      <div style="white-space: nowrap">
-        <el-card>
-          <el-row>
-            <el-input v-model="partName" placeholder="零件图号或名称" size="small" clearable style="width:180px;margin: 3px 0"/>
-            <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
-            <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
-            <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
-              <el-button :loading="edit2_loading" type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left: 50px" @click="edit2()">外购备料</el-button>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
-              <el-button :loading="edit_loading" type="distribution" size="small" icon="el-icon-setting" style="margin-left:20px" @click="edit('BL')">自家备料</el-button>
-            </el-tooltip>
-            <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
-              <el-checkbox v-model="all" size="small">查询全部</el-checkbox>
-            </el-tooltip>
-            <!--<el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top">-->
-            <!--<el-button class="button111" size="small" icon="el-icon-printer" style="margin-left:10px" @click="exportTable('BL')">打印自家备料单</el-button>-->
-            <!--</el-tooltip>-->
-            <!--<el-tooltip :open-delay="1000" effect="dark" content="导出备料分配单" placement="top">-->
-            <!--<el-button type="primary" plain class="el-icon-download" size="small" style="margin: 3px 0px 0 170px" @click="exportExcel">导出</el-button>-->
-            <!--</el-tooltip>-->
-          </el-row>
-        </el-card>
-      </div>
-    </div>
-    <el-card>
+    <el-card style="width: 1030px">
+      <el-col style="margin: 5px">
+        <el-input v-model="partName" placeholder="零件图号或名称" size="small" clearable style="width:180px;margin: 3px 0"/>
+        <el-button size="small" icon="el-icon-search" type="primary" plain style="margin-left: 10px" @click="pageSize=30; pageCurrent=1;searchTable()">查询</el-button>
+        <el-tooltip :open-delay="1200" effect="dark" content="打印备料单" placement="top"/>
+        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为外购备料" placement="top">
+          <el-button :loading="edit2_loading" type="primary" size="small" icon="el-icon-s-shop" plain style="margin-left: 50px" @click="edit2()">外购备料</el-button>
+        </el-tooltip>
+        <el-tooltip :open-delay="1200" effect="dark" content="将选中零件分配为自家备料" placement="top">
+          <el-button :loading="edit_loading" type="distribution" size="small" icon="el-icon-setting" style="margin-left:20px" @click="edit('BL')">自家备料</el-button>
+        </el-tooltip>
+        <el-tooltip :open-delay="1200" effect="dark" content="已导出和未导出备料单" placement="top">
+          <el-checkbox v-model="all" size="small" style="float: right;margin: 8px 10px 0 0">查询全部</el-checkbox>
+        </el-tooltip>
+      </el-col>
+    </el-card>
+    <el-card style="width: 1030px">
       <el-table
         v-loading="loading"
         :data="tableData"
diff --git a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
index 96841ed7..434545fd 100644
--- a/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
+++ b/src/views/ManufacturingCenter/MonthEndHourAccounting/index.vue
@@ -22,7 +22,7 @@
     </el-card>
     <el-card>
       <el-table v-loading="loading" :data="tableData" size="mini" style="max-height: 720px" height="720px" border @sort-change="sortChange">
-        <el-table-column align="center" label="跟单号" width="120px">
+        <el-table-column align="center" label="跟单号" width="100px">
           <template slot-scope="scope">
             {{ scope.row.跟单号 }}
           </template>
@@ -42,7 +42,7 @@
             {{ scope.row.操作工 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="图号" width="150px">
+        <el-table-column align="center" label="图号" width="120px">
           <template slot-scope="scope">
             {{ scope.row.零件图号 }}
           </template>
@@ -62,66 +62,56 @@
             {{ scope.row.完成数量 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="单件工时(分)" width="110px">
+        <el-table-column align="center" label="单件工时(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.修补单件工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="加工工时(分)" width="110px">
+        <el-table-column align="center" label="加工工时(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.完成工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="完成工时(分)" width="110px">
+        <el-table-column align="center" label="完成工时(分)" width="70px">
           <template slot-scope="scope">
             {{ Number(scope.row.完成工时) + Number(scope.row.修补工时) }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="准结(分)" width="110px">
+        <el-table-column align="center" label="准结(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.修补工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" width="200px" show-overflow-tooltip="">
+        <el-table-column align="center" label="备注" width="50px" show-overflow-tooltip="">
           <template slot-scope="scope">
             {{ scope.row.备注 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="扫码工时(分)" width="110px">
+        <el-table-column align="center" label="扫码工时(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.扫码工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="工时比值" width="100px">
+        <el-table-column align="center" label="工时比值" width="70px">
           <template slot-scope="scope">
             {{ scope.row.工时比值 }}
           </template>
         </el-table-column>
-        <!--<el-table-column align="center" label="废品件数" width="80px">-->
-        <!--<template slot-scope="scope">-->
-        <!--{{ scope.row.不合格数量 }}-->
-        <!--</template>-->
-        <!--</el-table-column>-->
-        <el-table-column align="center" label="计划准结(分)" width="110px">
+        <el-table-column align="center" label="计划准结(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.准结定额工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="计划定额(分)" width="110px">
+        <el-table-column align="center" label="计划定额(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.单件定额工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="计划工时(分)" width="110px">
+        <el-table-column align="center" label="计划工时(分)" width="70px">
           <template slot-scope="scope">
             {{ scope.row.计划工时 }}
           </template>
         </el-table-column>
-        <el-table-column align="center" label="项目名称" width="130px">
-          <template slot-scope="scope">
-            {{ scope.row.项目名称 }}
-          </template>
-        </el-table-column>
         <el-table-column align="center" label="机床图号" width="100px">
           <template slot-scope="scope">
             {{ scope.row.机床图号 }}
diff --git a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
index 0f8ab9e5..30967cd8 100644
--- a/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
+++ b/src/views/WorkshopProcurement/CreatingPurchasingMaterials/index.vue
@@ -1,8 +1,8 @@
 <template>
   <div>
-    <div style="width: 100%;overflow:auto">
-      <div style="white-space: nowrap">
-        <el-card style="margin-left: 0px;width:740px; display: inline-block;">
+    <el-row>
+      <el-col style="margin-left: 0px;width: 44%">
+        <el-card>
           <el-col>
             <el-input v-model="partDrawingNumber" placeholder="机床号或零件图号或零件名称" size="small" clearable style="margin: 3px 0;width: 200px" @keyup.enter.native="searchTable1"/>
             <el-tooltip :open-delay="1200" effect="dark" content="查询备料零件" placement="top">
@@ -24,37 +24,37 @@
               @sort-change="sortChange"
               @selection-change="handleSelectionChange">
               <el-table-column type="selection" align="center" width="45"/>
-              <el-table-column label="机床图号" prop="机床图号" width="120" sortable="custom" align="center">
+              <el-table-column label="机床图号" prop="机床图号" width="110" sortable="custom" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.机床图号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="组号" prop="组号" width="70" align="center">
+              <el-table-column label="组号" prop="组号" width="60" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.组号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="零件图号" prop="零件图号" min-width="120" width="160" align="center" show-overflow-tooltip>
+              <el-table-column label="零件图号" prop="零件图号" width="120" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.零件图号 }}
                 </template>
               </el-table-column>
-              <el-table-column label="零件名称" prop="零件名称" width="120" sortable="custom" align="center" show-overflow-tooltip>
+              <el-table-column label="零件名称" prop="零件名称" width="110" sortable="custom" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.零件名称 }}
                 </template>
               </el-table-column>
-              <el-table-column label="数量" width="70" align="center">
+              <el-table-column label="数量" width="60" align="center">
                 <template slot-scope="scope">
                   {{ scope.row.批次数量 }}
                 </template>
               </el-table-column>
-              <el-table-column label="材料" prop="材料" width="120" sortable="custom" align="center" show-overflow-tooltip>
+              <el-table-column label="材料" prop="材料" width="100" sortable="custom" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.材料 }}
                 </template>
               </el-table-column>
-              <el-table-column label="分配时间" prop="备料任务分配时间" width="120" align="center" show-overflow-tooltip>
+              <el-table-column label="分配时间" prop="备料任务分配时间" width="90" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.备料任务分配时间 }}
                 </template>
@@ -78,9 +78,10 @@
             </div>
           </el-col>
         </el-card>
-        <el-card style="margin-left: 1px;width:1120px; display: inline-block;">
-          <div> <!--slot="header"-->
-            <!--<el-input v-model="purchasingOrder" placeholder="采购计划单号" size="small" style="margin: 3px 0;width: 155px" clearable @keyup.enter.native="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()"/>-->
+      </el-col>
+      <el-col style="margin-left: 1px;width: 55%">
+        <el-card>
+          <div>
             <el-button class="button111" size="small" icon="el-icon-circle-plus-outline" style="margin-left: 10px" @click="addPurchaseOrder">外购备料</el-button>
             <el-tooltip :open-delay="1200" effect="dark" content="向选择的采购计划里添加采购零件" placement="top">
               <el-button v-positive="'loading'" :disabled="Number(采购计划状态)===3 || Number(采购计划状态)===4" type="primary" plain size="small" icon="el-icon-download" style="margin-left: 10px" @click="addMateriel">选入</el-button>
@@ -107,10 +108,6 @@
               range-separator="～"
               start-placeholder="开始日期"
               end-placeholder="结束日期"/>
-            <!--<el-input v-model="supplierName0" placeholder="供应商" size="small" clearable/>-->
-            <!--<el-tooltip :open-delay="1200" effect="dark" content="查询采购计划单" placement="top">-->
-            <!--<el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px" @click="pageCurrent2=1;pageSize2=10;total2=0;searchTable2()">查询</el-button>-->
-            <!--</el-tooltip>-->
             <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px" @click="searchTable2">查询</el-button>
           </div>
           <el-table
@@ -124,7 +121,7 @@
             size="mini"
             highlight-current-row
             @row-click="searchTable3">
-            <el-table-column label="进程" prop="采购计划状态" align="center" width="80" fixed="left">
+            <el-table-column label="进程" prop="采购计划状态" align="center" width="70" fixed="left">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.采购计划状态)===0" type="warning" size="mini">编辑中</span>
                 <span v-if="Number(scope.row.采购计划状态)===1" type="primary" size="mini">已保存</span>
@@ -132,33 +129,32 @@
                 <span v-if="Number(scope.row.采购计划状态)===4" type="info" size="mini">已结算</span>
               </template>
             </el-table-column>
-            <el-table-column label="外购备料单号" prop="采购单号" align="center" width="180">
+            <el-table-column label="外购备料单号" prop="采购单号" align="center" width="150">
               <template slot-scope="scope">
                 {{ scope.row.采购单号 }}
               </template>
             </el-table-column>
-            <el-table-column label="外购备料单名称" prop="采购单名称" align="center" width="180">
+            <el-table-column label="外购备料单名称" prop="采购单名称" align="center" width="140">
               <template slot-scope="scope">
                 {{ scope.row.采购单名称 }}
               </template>
             </el-table-column>
-            <!--<el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="200" show-overflow-tooltip>-->
-            <el-table-column label="供应商" prop="供应商名称" align="center" min-width="200" width="250" show-overflow-tooltip>
+            <el-table-column label="供应商" prop="供应商名称" align="center" width="180" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供应商名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="采购员" prop="姓名" align="center" width="110" show-overflow-tooltip>
+            <el-table-column label="采购员" prop="姓名" align="center" width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.姓名 }}
               </template>
             </el-table-column>
-            <el-table-column label="计划完成" align="center" width="120">
+            <el-table-column label="计划完成" align="center" width="100">
               <template slot-scope="scope">
                 {{ scope.row.计划完成日期.split(' ')[0] }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="170px">
+            <el-table-column label="操作" align="center" width="160px">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1200" effect="dark" content="导出" placement="top">
                   <div style="display: inline-block">
@@ -183,17 +179,6 @@
               </template>
             </el-table-column>
           </el-table>
-          <!--<div class="block">-->
-          <!--<el-pagination-->
-          <!--:current-page="pageCurrent2"-->
-          <!--:page-sizes="[10, 20, 30, 40]"-->
-          <!--:page-size="pageSize2"-->
-          <!--:total="total2"-->
-          <!--style="display:inline-block;width:40%;float: right;margin-right: 60px"-->
-          <!--layout="total, sizes, prev, pager, next, jumper"-->
-          <!--@size-change="handleSizeChange2"-->
-          <!--@current-change="handleCurrentChange2"/>-->
-          <!--</div>-->
           <div class="block">
             <el-pagination
               v-show="false"
@@ -206,7 +191,7 @@
               @size-change="handleSizeChange2"
               @current-change="handleCurrentChange2"/>
           </div>
-          <el-table v-loading="" :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border highlight-current-row style="margin: 3px 0;width: 1100px" height="455px" width="1100px" size="mini">
+          <el-table v-loading="" :data="tableData3" :header-cell-style="{fontFamily:'YouYuan',fontSize:'14px',fontWeight:200}" border highlight-current-row style="margin: 3px 0;width: 1100px" height="475px" width="1100px" size="mini">
             <el-table-column label="进程" align="center" width="60">
               <template slot-scope="scope">
                 <span v-if="Number(scope.row.是否到货)===0" type="warning" size="mini">未到货</span>
@@ -214,22 +199,22 @@
                 <span v-if="Number(scope.row.是否到货)===2" type="info" size="mini">已结算</span>
               </template>
             </el-table-column>
-            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="160" show-overflow-tooltip>
+            <el-table-column label="物料编码" prop="物料零件编码" align="center" width="120" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料零件编码 }}
               </template>
             </el-table-column>
-            <el-table-column label="零件名称" align="center" width="120">
+            <el-table-column label="零件名称" align="center" width="90">
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column label="材料" prop="材料" align="center" width="140">
+            <el-table-column label="材料" prop="材料" align="center" width="80">
               <template slot-scope="scope">
                 {{ scope.row.材料 }}
               </template>
             </el-table-column>
-            <el-table-column label="数量" align="center" width="135">
+            <el-table-column label="数量" align="center" width="110">
               <template slot-scope="scope">
                 <el-input-number :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.采购数量" :min="0" size="mini" style="width: 100%" @change="saveWeight(scope.$index, scope.row)"/>
               </template>
@@ -244,12 +229,12 @@
                 <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.单位" size="mini" style="width:100%" @change="saveMoney(scope.$index, scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="备注" align="center" prop="备注" width="130px">
+            <el-table-column label="备注" align="center" prop="备注" width="100px">
               <template slot-scope="scope">
                 <el-input :disabled="parseInt(scope.row.是否到货)===1 || parseInt(scope.row.是否到货)===2" v-model="scope.row.备注1" size="mini" style="width:100%" @change="saveRemarks(scope.$index, scope.row)"/>
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="90px" fixed="right">
+            <el-table-column label="操作" align="center" width="80px" fixed="right">
               <template slot-scope="scope">
                 <el-tooltip :open-delay="1000" effect="dark" content="移出" placement="top">
                   <div style="display: inline-block">
@@ -260,9 +245,9 @@
             </el-table-column>
           </el-table>
         </el-card>
-      </div>
-    </div>
-    <div>
+      </el-col>
+    </el-row>
+    <el-row>
       <el-card style="width: 1100px;margin: 10px auto">
         <div id="WGBLD" style="width: 1000px;margin: 0 auto">
           <table cellspacing="0px" align="center" border="1 solid black" width="100%">
@@ -310,7 +295,7 @@
           <div style="margin-top: 20px">联系人:___________ 联系电话:___________ </div>
         </div>
       </el-card>
-    </div>
+    </el-row>
 
     <el-dialog v-el-drag-dialog :title="title2" :visible.sync="dialogVisible2" center style="min-height: 300px" width="600px" @close="closedialog()">
       <el-form ref="form2" :model="form2" :rules="rules2" label-position="right" label-width="120px">
@@ -972,9 +957,6 @@ export default {
     height: 40px;
     text-align: center;
   }
-  /*.el-card{*/
-  /*  margin-bottom: 15px;*/
-  /*}*/
   .el-date-editor{
     width:150px;
   }
@@ -984,9 +966,6 @@ export default {
   .el-input{
     width:200px
   }
-  span{
-    /*margin: 10px 0 10px 0px;*/
-  }
   .el-tag{
     margin: 0
   }
@@ -1038,4 +1017,3 @@ export default {
     }
   }
 </style>
-
diff --git a/src/views/layout/components/TagsView.vue b/src/views/layout/components/TagsView.vue
index 55e1f0e4..b32438e8 100644
--- a/src/views/layout/components/TagsView.vue
+++ b/src/views/layout/components/TagsView.vue
@@ -77,9 +77,9 @@ export default {
           document.getElementsByClassName('navbar')[0].style.minWidth = '1700px'
           break
         case 'CreatingPurchasingMaterials': // 外购备料
-          document.getElementById('app-main').style.width = '1865px'
-          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1865px'
-          document.getElementsByClassName('navbar')[0].style.minWidth = '1865px'
+          document.getElementById('app-main').style.width = '1680px'
+          document.getElementsByClassName('tags-view-wrapper')[0].style.minWidth = '1680px'
+          document.getElementsByClassName('navbar')[0].style.minWidth = '1680px'
           break
         case 'RequestOutsourcingMaterials': // 外购备料请款
           document.getElementById('app-main').style.width = '1710px'