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

src/styles/element-ui.scss

@@ -41,13 +41,19 @@
  }
  //单击表格行变色
  .el-table__body tr.current-row>td{
-   background-color: rgb(216,229,245) !important;
+   background-color: #d8e5f6 !important;
    /* color: #f19944; */  /* 设置文字颜色，可以选择不设置 */
  }
  //聚焦表格行变色
  .hover-row td{
-   background: RGB(236 245 255)!important;
+   //background: RGB(236 245 255)!important;
+   background: red!important;
+
  }
+ .el-table--enable-row-hover .el-table__body tr:hover>td{
+   background-color: #d8e5f6 !important;
+ }
+ //.el-table tbody tr:hover>td { background-color: RED }
  //表格行颜色9745
  //.el-table td, .is-leaf{
  //  background-color: rgb(255, 255, 255);

src/styles/index.scss

@@ -140,6 +140,13 @@ el-card{
 .el-table{
   margin: 3px 0px;
 }
+.el-table td.gutter,.el-table th.gutter{
+  width: 15px;
+  border-right-width: 0;
+  border-bottom-width: 0;
+  padding: 0;
+  background: white;
+}s
 .block{
   margin-bottom: 3px;
 }
@@ -198,10 +205,16 @@ el-card{
   }
 }
 //登录页login输入框上串所以屏蔽
-//.el-input__inner:focus {
-//  border: 1px solid #1b55a0!important;
-//  height: 29px;
-//}
+.el-input__inner:focus {
+  border: 1px solid #2A71CB!important;
+  //height: 29px;
+}
+.el-input__inner{
+  border: 1px solid red
+}
+.el-textarea__inner, .el-radio__inner, .el-input__inner{
+  border: 1px solid #676767 !important
+}
 //.el-input--small .el-input__inner {
 //  height: 29px;
 //}

src/utils/curd.js

@@ -4,7 +4,7 @@ import { type } from './tool' // type判断传入值的类型，比typeof更详
 export default {
   install(Vue) {
     Vue.prototype.exportExcel_NPOI = function(param) {
-      console.log(ExcelDownLoad, param, 1111111111)
+      console.log(param, 1)
       download(`${ExcelDownLoad}?param=${param}`)
     }
     Vue.prototype.CreateData = function(type, name, data, pageSize, pageList) {
@@ -272,6 +272,7 @@ export default {
 }
 function download(url) {
   getBlob(url, function(blob, filename) {
+    console.log(blob, filename, 2)
     saveAs(blob, filename)
   })
 }
@@ -283,14 +284,14 @@ function getBlob(url, cb) {
   xhr.onload = function() {
     if (xhr.status === 200) {
       const name = xhr.getResponseHeader('content-disposition').split('=')[1]
-      var filename1 = decodeURIComponent(name)
-      cb(xhr.response, filename1)
+      var filename = decodeURIComponent(name)
+      cb(xhr.response, filename)
     }
   }
   xhr.send()
 }
 
-function saveAs(blob, filename = '下载文件.xls') {
+function saveAs(blob, filename) {
   if (window.navigator.msSaveOrOpenBlob) {
     navigator.msSaveBlob(blob, filename)
   } else {

src/utils/request.js

@@ -17,7 +17,7 @@ export const download = `http://123.56.95.229:8010/submit/downloadFile.ashx` //
 export const uploadPerson = `http://123.56.95.229:8010/submit/uploadPerson.ashx`
 export const uploadOP = `http://123.56.95.229:8010/submit/uploadOP.ashx`
 export const url = `http://123.56.95.229:8010/submit/MESCommonBase.ashx` // 采购件入库、离线件入库
-export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/downloadFile.ashx' // 导出excel
+export const ExcelDownLoad = 'http://123.56.95.229:8010/submit/MESDownloadExcel.ashx' // 导出excel
 export const ExcelWaiGou = 'http://192.168.0.106:8045/submit/excel.ashx' // 导出excel
 // 技术中心程序发布时要更改下面所有的IP到0段
 export const ServerIP = `http://123.56.95.229:8010/webpage/file/`

src/views/Outsourcing/OutsourcingPaymentPlanManagement/index.vue

@@ -6,6 +6,7 @@
           <span>外协厂家:</span>
           <el-input v-model="ManufacturerName" size="small" placeholder="外协厂家" clearable style="width:200px"/>
           <el-button type="primary" class="el-icon-search" size="small" plain @click="pageCurrent=1;pageSize=50;getParts()">查询</el-button>
+          <el-button type="primary" class="el-icon-search" size="small" plain @click="exportExcel()">查询</el-button>
         </el-row>
         <el-table v-loading="loading" :data="tableData" size="mini" highlight-current-row height="500" style="width: 100%;" border element-loading-text="拼命加载中" @row-click="rowClick">
           <el-table-column label="厂家" prop="外协厂家名称" align="center" width="230px">
@@ -180,6 +181,17 @@ export default {
     this.getParts()
   },
   methods: {
+    exportExcel() {
+      var param = []
+      param[0] = ['物料名称_check', 0]
+      param[1] = ['物料名称', 0]
+      param[2] = ['物料规格_check', 0]
+      param[3] = ['物料规格', 0]
+      param[4] = ['物料型号_check', 0]
+      param[5] = ['物料型号', 0]
+      var Data = this.CreateData('00', '报表_采购部仓库_库存_查询', param)
+      this.exportExcel_NPOI(Data)
+    },
     // 获取表格1数据
     getParts() {
       this.loading = true

src/views/PurchasingCenter/PurchaseTaskAllocate/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container">
-    <el-card>
+    <el-card style="">
       <div v-if="Number(token)===2" style="width:100%">
         <el-divider content-position="right">
           <el-button type="text" @click="searchUnallocatePartNumber">刷新</el-button> | 待分配零件数
         </el-divider>
-        <el-row>
+        <el-row >
           <el-col v-for="(machine,index) in machines" :key="index" style="width: 200px">
             <el-card shadow="hover" class="sudoku_item" style="height:80px;width: 90%" @click.native="clickCard(machine.项目流水号, machine.机床流水号)">
               <el-badge :value="machine.未分配零件数">
@@ -66,6 +66,7 @@
             placeholder="物料类别"
             size="small"
             clearable
+            style="width: 120px"
             @change="searchMaterialVariety">
             <el-option
               v-for="item in MaterialCategory"
@@ -77,6 +78,7 @@
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
             size="small"
+            style="width: 120px"
             clearable>
             <el-option
               v-for="item in MaterialVariety"
@@ -87,39 +89,47 @@
           <el-button type="primary" size="small" icon="el-icon-search" plain style="margin-left: 10px;" @click="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">查询</el-button>
           <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">未分配</el-radio>
           <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent0=1;pageSize0=50;total0=0;searchTable0()">已分配</el-radio>
-          <div style="float:right;">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
-              <el-button
-                type="warning"
-                size="small"
-                icon="el-icon-menu"
-                plain
-                style="margin-left: 10px"
-                @click="allocateTask1">分配</el-button>
-            </el-tooltip>
-            <el-tooltip :open-delay="1000" effect="dark" content="退回勾选的未分配的物料至车间" placement="top">
-              <el-button
-                type="danger"
-                size="small"
-                icon="el-icon-back"
-                plain
-                style="margin-left: 10px"
-                @click="executeReturn1">退回</el-button>
-            </el-tooltip>
-          </div>
+          <!--<div style="float:right;">-->
+          <!--<span style="margin-left: 0">采购员:</span>-->
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 140px">
+            <el-option
+              v-for="item in person"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-tooltip :open-delay="1000" effect="dark" content="选择采购员后，将物料分配给所选的采购员" placement="top">
+            <el-button
+              type="primary"
+              size="small"
+              icon="el-icon-menu"
+              style="margin-left: 10px"
+              @click="allocateTask1">分配</el-button>
+          </el-tooltip>
+          <el-tooltip :open-delay="1000" effect="dark" content="退回勾选的未分配的物料至车间" placement="top">
+            <el-button
+              type="danger"
+              size="small"
+              icon="el-icon-back"
+              style="margin-left: 10px"
+              @click="executeReturn1">打回</el-button>
+          </el-tooltip>
+          <!--</div>-->
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table v-loading="loading" :data="tableData0" size="mini" height="800px" border stripe @selection-change="handleSelectionChange1">
+          <el-table
+            v-loading="loading"
+            :data="tableData0"
+            :header-cell-style="{fontFamily:'MicrosoftYaHeiUI',fontSize:'14px',fontWeight:200}"
+            size="mini"
+            height="800px"
+            style="width: 1285px"
+            border
+            stripe
+            highlight-current-row
+            @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" label="采购情况" prop="询价状态编号" min-width="100px">
+            <el-table-column align="center" label="采购状态" prop="询价状态编号" min-width="100px" width="80px">
               <template slot-scope="scope">
                 <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
                 <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
@@ -127,57 +137,57 @@
                 <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="180px">
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="180px" width="160px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="300">
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="300" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px">
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
+            <el-table-column align="center" label="数量" min-width="80px" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.项目名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
+            <!--<el-table-column align="center" label="项目名称" prop="项目名称" min-width="100px" width="140px">-->
+            <!--<template slot-scope="scope">-->
+            <!--{{ scope.row.项目名称 }}-->
+            <!--</template>-->
+            <!--</el-table-column>-->
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="组号" min-width="80px">
+            <el-table-column align="center" label="组号" min-width="80px" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">
+            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料品种" label="物料品种" min-width="100px">
+            <el-table-column align="center" prop="物料品种" label="物料品种" min-width="100px" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备注" min-width="100px">
+            <el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px">
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -267,6 +277,7 @@
             placeholder="物料类别"
             size="small"
             clearable
+            style="width: 120px"
             @change="searchMaterialVariety">
             <el-option
               v-for="item in MaterialCategory"
@@ -278,6 +289,7 @@
             v-model="MaterialVarietyValue"
             placeholder="物料品种"
             size="small"
+            style="width: 120px"
             clearable>
             <el-option
               v-for="item in MaterialVariety"
@@ -288,81 +300,73 @@
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">查询</el-button>
           <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">未分配</el-radio>
           <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent1=1;pageSize1=50;total1=0;searchTable1()">已分配</el-radio>
-          <div style="float:right;">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>
-            <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">退回</el-button>
-          </div>
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px;margin-left: 120px">
+            <el-option
+              v-for="item in person"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask1">分配</el-button>
+          <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn1">打回</el-button>
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table v-loading="loading" :data="tableData1" size="mini" height="800px" border stripe @selection-change="handleSelectionChange1">
+          <el-table v-loading="loading" :data="tableData1" size="mini" height="800px" style="width: 1255px" border stripe @selection-change="handleSelectionChange1">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="100px">
+            <el-table-column align="center" prop="询价状态编号" label="采购状态" min-width="100px" width="80px">
               <template slot-scope="scope">
-                <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</el-tag>
-                <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
+                <span v-if="scope.row.人员编号===''" type="primary" size="small">未分配</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</span>
+                <span v-if="parseInt(scope.row.询价状态编号)===3&&parseInt(scope.row.采购状态编号)!==3" type="success" size="small">已询价</span>
+                <span v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</span>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料名称" label="名称" min-width="180px">
+            <el-table-column align="center" prop="物料名称" label="名称" min-width="180px" width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料规格" label="规格" min-width="300">
+            <el-table-column align="center" prop="物料规格" label="规格" min-width="300" width="150px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.物料规格 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px">
+            <el-table-column align="center" prop="物料型号" label="图号或型号" min-width="150px" width="150px">
               <template slot-scope="scope">
                 {{ scope.row.物料型号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="数量" min-width="80px">
+            <el-table-column align="center" label="数量" min-width="80px" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
-              <template slot-scope="scope">
-                {{ scope.row.项目名称 }}
-              </template>
-            </el-table-column>
-            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="组号" min-width="80px">
+            <el-table-column align="center" label="组号" min-width="80px" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px">
+            <el-table-column align="center" prop="物料类别" label="物料类别" min-width="100px" width="80px">
               <template slot-scope="scope">
                 {{ scope.row.物料类别 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="物料品种" prop="物料品种" min-width="100px">
+            <el-table-column align="center" label="物料品种" prop="物料品种" min-width="100px" width="100px">
               <template slot-scope="scope">
                 {{ scope.row.物料品种 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备注" min-width="100px">
+            <el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px">
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="100px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -447,23 +451,20 @@
           <el-button type="success" size="small" icon="el-icon-search" style="margin-left: 10px;" @click="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">查询</el-button>
           <el-radio v-model="radio" label="1" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">未分配</el-radio>
           <el-radio v-model="radio" label="2" style="margin-left: 10px" @change="pageCurrent2=1;pageSize2=50;total2=0;searchTable2()">已分配</el-radio>
-          <div style="float:right">
-            <span style="margin-left: 0">采购员:</span>
-            <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
-              <el-option
-                v-for="item in person"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"/>
-            </el-select>
-            <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>
-            <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">退回</el-button>
-          </div>
+          <el-select v-model="personValue" placeholder="采购员" size="small" style="width: 100px">
+            <el-option
+              v-for="item in person"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"/>
+          </el-select>
+          <el-button type="primary" size="small" icon="el-icon-menu" style="margin-left: 10px" @click="allocateTask2">分配</el-button>
+          <el-button type="danger" size="small" icon="el-icon-back" style="margin-left: 10px" @click="executeReturn2">打回</el-button>
         </el-row>
         <el-row style="margin-bottom: 10px">
-          <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" border stripe @selection-change="handleSelectionChange2">
+          <el-table v-loading="loading" :data="tableData2" size="mini" height="800px" style="width: 1520px" border stripe @selection-change="handleSelectionChange2">
             <el-table-column :selectable="selectable" align="center" type="selection"/>
-            <el-table-column align="center" prop="询价状态编号" label="采购情况" min-width="80px">
+            <el-table-column align="center" prop="询价状态编号" label="采购状态" min-width="80px" width="80px">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.人员编号===''" type="primary" size="small">未分配</el-tag>
                 <el-tag v-if="parseInt(scope.row.询价状态编号)===1&&scope.row.人员编号!==''" type="warning" size="small">未询价</el-tag>
@@ -471,17 +472,17 @@
                 <el-tag v-if="parseInt(scope.row.采购状态编号)===3" type="info" size="small">已采购</el-tag>
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件图号" label="图号" min-width="120px">
+            <el-table-column align="center" prop="零件图号" label="图号" min-width="120px" width="180px">
               <template slot-scope="scope">
                 {{ scope.row.零件图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="零件名称" label="名称" width="180px">
+            <el-table-column align="center" prop="零件名称" label="名称" width="140px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.零件名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="规格" label="规格" width="250px">
+            <el-table-column align="center" prop="规格" label="规格" width="150px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.规格 }}
               </template>
@@ -496,27 +497,27 @@
                 {{ scope.row.零件数量 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px">
+            <el-table-column align="center" prop="项目名称" label="项目名称" min-width="100px" width="140px">
               <template slot-scope="scope">
                 {{ scope.row.项目名称 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px">
+            <el-table-column align="center" prop="机床图号" label="机床图号" min-width="100px" width="120px">
               <template slot-scope="scope">
                 {{ scope.row.机床图号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="组号" label="组号" min-width="80px">
+            <el-table-column align="center" prop="组号" label="组号" min-width="80px" width="70px">
               <template slot-scope="scope">
                 {{ scope.row.组号 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="备注" min-width="100px">
+            <el-table-column align="center" label="备注" min-width="100px" width="120px" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.备注 }}
               </template>
             </el-table-column>
-            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px">
+            <el-table-column align="center" prop="供货商" label="供货商" min-width="100px" width="190" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{ scope.row.供货商 }}
               </template>
@@ -1147,4 +1148,20 @@ export default {
       line-height: 46px;
     }
   }
+  /*.el-table td.gutter,.el-table th.gutter{*/
+    /*width: 15px;*/
+    /*border-right-width: 0;*/
+    /*border-bottom-width: 0;*/
+    /*padding: 0;*/
+    /*background: red;*/
+  /*}*/
+</style>
+<style>
+  /*.el-table td.gutter,.el-table th.gutter{*/
+    /*width: 15px;*/
+    /*border-right-width: 0;*/
+    /*border-bottom-width: 0;*/
+    /*padding: 0;*/
+    /*background: white;*/
+  /*}*/
 </style>

src/views/WorkshopProcurement/NewArrivalList/index.vue

@@ -945,10 +945,10 @@ export default {
       })
     },
     searchTable5(row) {
+      console.log(row)
       this.excle_row = row
       console.log(this.userId, this.id)
       this.disable = row.是否关联
-      console.log(this.disable)
       this.tableData6 = []
       this.到货单流水号 = row.到货单流水号
       this.ArrivalOrderNumber = row.到货单流水号

src/views/login/index.vue

@@ -235,7 +235,7 @@ export default {
     }
     input {
       background: transparent;
-      border: 0;
+      border: 1px;
       -webkit-appearance: none;
       border-radius: 0;
       padding: 12px 5px 12px 15px;