Browse Source

【修改】调整列表页样式

莫绍宝 3 years ago
parent
commit
fa975ada05

+ 7 - 7
src/views/stock/reserved_stock.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="screen-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
             <el-form-item label="产品大类" prop="type">
@@ -39,8 +39,8 @@
           
           
           <el-col :xs="24" :sm="24" :lg="12" class="tr">
           <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-form-item label="">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -61,7 +61,7 @@
               <span>{{scope.row.customerNumber}}</span>
               <span>{{scope.row.customerNumber}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerName" />
               <CopyButton :copyText="scope.row.customerName" />
               <span>{{scope.row.customerName}}</span>
               <span>{{scope.row.customerName}}</span>
@@ -86,15 +86,15 @@
               <span>{{scope.row.materialName}}</span>
               <span>{{scope.row.materialName}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.specification" />
               <CopyButton :copyText="scope.row.specification" />
               <span>{{scope.row.specification}}</span>
               <span>{{scope.row.specification}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="经销商预留库存" prop="reservedNum" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="经销商暂扣库存" prop="temporaryNum" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商预留库存" prop="reservedNum" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商暂扣库存" prop="temporaryNum" min-width="120" show-overflow-tooltip></el-table-column>
         </el-table>
         </el-table>
       </div>
       </div>
     </div>
     </div>

+ 11 - 11
src/views/stock/stock_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="screen-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="warehouse">
             <el-form-item label="仓库" prop="warehouse">
@@ -55,8 +55,8 @@
 
 
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -72,7 +72,7 @@
       <div class="table">
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
           <el-table-column align="left" label="产品大类" prop="mainName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="产品大类" prop="mainName" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="产品类别" prop="categoryName" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="产品类别" prop="categoryName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
           <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.materialNumber" />
               <CopyButton :copyText="scope.row.materialNumber" />
@@ -91,19 +91,19 @@
               <span>{{scope.row.materialName}}</span>
               <span>{{scope.row.materialName}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.specification" />
               <CopyButton :copyText="scope.row.specification" />
               <span>{{scope.row.specification}}</span>
               <span>{{scope.row.specification}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column align="left" label="单位" prop="baseUnitId" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="baseUnitId" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="总库存数量" prop="stockQty" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="可用库数" prop="stockAdequate" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="可开单数" prop="openNumber" min-width="120" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="经销商预留库存" prop="reservedNum" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="经销商暂扣库存" prop="temporaryNum" min-width="140" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="开单未提数量" prop="num" min-width="140" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="总库存数量" prop="stockQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="可用库数" prop="stockAdequate" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="可开单数" prop="openNumber" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商预留库存" prop="reservedNum" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商暂扣库存" prop="temporaryNum" min-width="120" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="开单未提数量" prop="num" min-width="120" show-overflow-tooltip></el-table-column>
         </el-table>
         </el-table>
       </div>
       </div>
     </div>
     </div>

+ 3 - 3
src/views/supply/allot/allot_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="单据编号" prop="orderNum">
               <el-form-item label="单据编号" prop="orderNum">
@@ -31,8 +31,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>

+ 11 - 11
src/views/supply/apply/apply_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
@@ -58,7 +58,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -83,8 +83,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -94,8 +94,8 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'invoice/listExport'" :exParams="exParams" />
             <ExportButton :exUrl="'invoice/listExport'" :exParams="exParams" />
@@ -117,7 +117,7 @@
                 {{scope.row.type | orderTypeFilter}}
                 {{scope.row.type | orderTypeFilter}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="发货申请单" prop="id" min-width="130" show-overflow-tooltip>
+            <el-table-column align="left" label="发货申请单" prop="id" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
                 <span>{{scope.row.id}}</span>
@@ -129,7 +129,7 @@
                 {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
                 {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="mainOrderId" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.mainOrderId" />
                 <CopyButton :copyText="scope.row.mainOrderId" />
                 <span>{{scope.row.mainOrderId}}</span>
                 <span>{{scope.row.mainOrderId}}</span>
@@ -141,7 +141,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -165,7 +165,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 12 - 12
src/views/supply/apply/engin_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
@@ -58,7 +58,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -83,8 +83,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -94,8 +94,8 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">发货申请</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'invoice/listProjectExport'" :exParams="exParams" />
             <ExportButton :exUrl="'invoice/listProjectExport'" :exParams="exParams" />
@@ -117,7 +117,7 @@
                 {{scope.row.type | orderTypeFilter}}
                 {{scope.row.type | orderTypeFilter}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="发货申请单" prop="id" min-width="140" show-overflow-tooltip>
+            <el-table-column align="left" label="发货申请单" prop="id" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
                 <span>{{scope.row.id}}</span>
@@ -129,13 +129,13 @@
                 {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
                 {{scope.row.type === 3 ? scope.row.stockName : scope.row.correspondName}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <span>{{scope.row.enginOrderNo}}</span>
                 <span>{{scope.row.enginOrderNo}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="工程登录编码" prop="refEnginRecordNo" min-width="220" show-overflow-tooltip>
+            <el-table-column align="left" label="工程登录编码" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{scope.row.refEnginRecordNo}}</span>
                 <span>{{scope.row.refEnginRecordNo}}</span>
@@ -149,7 +149,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -173,7 +173,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 7 - 8
src/views/supply/deliver/commerce_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <!-- <el-col :xs="24" :sm="24" :lg="24">
             <!-- <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="orderNum" label-width="0">
               <el-form-item prop="orderNum" label-width="0">
@@ -50,7 +50,6 @@
                   v-model="screenForm.date"
                   v-model="screenForm.date"
                   type="datetimerange"
                   type="datetimerange"
                   range-separator="至"
                   range-separator="至"
-                  style="width: 100%; height: 33px;"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期">
                   end-placeholder="结束日期">
@@ -76,7 +75,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -89,8 +88,8 @@
             
             
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -100,7 +99,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <!-- <el-button size="small" type="warning" icon="el-icon-close">退货</el-button> -->
+            <!-- <el-button size="mini" type="warning" icon="el-icon-close">退货</el-button> -->
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'ship/pExport'" :exParams="exParams" />
             <ExportButton :exUrl="'ship/pExport'" :exParams="exParams" />
@@ -140,7 +139,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -165,7 +164,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 2 - 2
src/views/supply/deliver/deliver_list.vue

@@ -70,8 +70,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="mini" @click="resetScreenForm">清空</el-button>
-                <el-button size="mini" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>

+ 7 - 8
src/views/supply/deliver/home_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <!-- <el-col :xs="24" :sm="24" :lg="24">
             <!-- <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="orderNum" label-width="0">
               <el-form-item prop="orderNum" label-width="0">
@@ -45,7 +45,6 @@
                   v-model="screenForm.date"
                   v-model="screenForm.date"
                   type="datetimerange"
                   type="datetimerange"
                   range-separator="至"
                   range-separator="至"
-                  style="width: 100%; height: 33px;"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   start-placeholder="开始日期"
                   start-placeholder="开始日期"
                   end-placeholder="结束日期">
                   end-placeholder="结束日期">
@@ -71,7 +70,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -84,8 +83,8 @@
             
             
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -95,7 +94,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <!-- <el-button size="small" type="warning" icon="el-icon-close">退货</el-button> -->
+            <!-- <el-button size="mini" type="warning" icon="el-icon-close">退货</el-button> -->
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'ship/pExport'" :exParams="exParams" />
             <ExportButton :exUrl="'ship/pExport'" :exParams="exParams" />
@@ -132,7 +131,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -157,7 +156,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 7 - 7
src/views/supply/deliver/sum_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="screen-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品名称" prop="goodsName">
             <el-form-item label="产品名称" prop="goodsName">
@@ -74,7 +74,7 @@
           </el-col>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="业务员" prop="salesMan">
             <el-form-item label="业务员" prop="salesMan">
-              <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+              <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                 <el-option
                 <el-option
                   v-for="item in salesmanList"
                   v-for="item in salesmanList"
                   :key="item.adminUserId"
                   :key="item.adminUserId"
@@ -87,8 +87,8 @@
           
           
           <el-col :xs="24" :sm="12" :lg="6" class="tr">
           <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-form-item label="">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -114,7 +114,7 @@
           :summary-method="$getSummaries">
           :summary-method="$getSummaries">
           <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="发货日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货单号" prop="id" min-width="140" show-overflow-tooltip>
+          <el-table-column align="left" label="发货单号" prop="id" min-width="120" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.id" />
               <CopyButton :copyText="scope.row.id" />
               <span>{{scope.row.id}}</span>
               <span>{{scope.row.id}}</span>
@@ -126,7 +126,7 @@
               <span>{{scope.row.customerNumber}}</span>
               <span>{{scope.row.customerNumber}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.customerName" />
               <CopyButton :copyText="scope.row.customerName" />
               <span>{{scope.row.customerName}}</span>
               <span>{{scope.row.customerName}}</span>
@@ -151,7 +151,7 @@
               <span>{{scope.row.materialName}}</span>
               <span>{{scope.row.materialName}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.specification" />
               <CopyButton :copyText="scope.row.specification" />
               <span>{{scope.row.specification}}</span>
               <span>{{scope.row.specification}}</span>

+ 23 - 23
src/views/supply/direct/direct_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm">
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
@@ -59,8 +59,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -70,7 +70,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'requisition/export'" :exParams="exParams" />
             <ExportButton :exUrl="'requisition/export'" :exParams="exParams" />
@@ -79,37 +79,37 @@
         <div class="table">
         <div class="table">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
           <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe @selection-change="handleSelectionChange">
             <el-table-column align="center" type="selection" width="55"></el-table-column>
             <el-table-column align="center" type="selection" width="55"></el-table-column>
-            <el-table-column align="center" label="直接调拨单号" prop="id" min-width="190" show-overflow-tooltip>
+            <el-table-column align="left" label="直接调拨单号" prop="id" min-width="190" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
                 <span>{{scope.row.id}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <span>{{scope.row.enginOrderNo}}</span>
                 <span>{{scope.row.enginOrderNo}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 {{scope.row.examineStatus | statusFilter}}
                 {{scope.row.examineStatus | statusFilter}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="单据日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="单据日期" prop="orderTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="调拨方向" prop="direction" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="调拨方向" prop="direction" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
             <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialCode" />
                 <CopyButton :copyText="scope.row.materialCode" />
@@ -128,23 +128,23 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="调拨数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="调出仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="调出仓位" prop="stockName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="调入仓库" prop="inCorrespondName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="调入仓位" prop="inStockName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="center" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="调拨数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="调出仓库" prop="correspondName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="调出仓位" prop="stockName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="调入仓库" prop="inCorrespondName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="调入仓位" prop="inStockName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="备注信息" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制单人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="制单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核人" prop="approvalName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="审核日期" prop="approvalTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="center" label="操作" width="180" fixed="right">
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>
                 <el-button type="text" @click="toForm(scope.row)" v-if="$checkBtnRole('edit', $route.meta.roles) && scope.row.examineStatus === 'SAVE'">编辑</el-button>

+ 6 - 6
src/views/supply/displace/displace_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="订单号" prop="orderNum">
               <el-form-item label="订单号" prop="orderNum">
@@ -59,8 +59,8 @@
 
 
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -70,7 +70,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()">新增</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()">新增</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
             <ExportButton :exUrl="'admin/user/mch/export'" :exParams="exParams" />
@@ -102,7 +102,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -126,7 +126,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 12 - 12
src/views/supply/engin/commerce_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-checkbox-group v-model="screenForm.status" @change="getList()">
                   <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-checkbox-button>
                   <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-checkbox-button>
                 </el-checkbox-group>
                 </el-checkbox-group>
               </el-form-item>
               </el-form-item>
@@ -67,7 +67,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -85,8 +85,8 @@
 
 
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -96,8 +96,8 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
-            <el-button size="small" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'engin-order/export'" :exParams="exParams" />
             <ExportButton :exUrl="'engin-order/export'" :exParams="exParams" />
@@ -121,7 +121,7 @@
                 {{scope.row.examineStatus | statusFilter}}
                 {{scope.row.examineStatus | statusFilter}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <span>{{scope.row.enginOrderNo}}</span>
                 <span>{{scope.row.enginOrderNo}}</span>
@@ -136,7 +136,7 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <el-table-column align="left" label="工程编码" prop="refProjectNo" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="工程编码" prop="refProjectNo" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="工程信息单号" prop="refEnginRecordNo" min-width="220" show-overflow-tooltip>
+            <el-table-column align="left" label="工程信息单号" prop="refEnginRecordNo" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <CopyButton :copyText="scope.row.refEnginRecordNo" />
                 <span>{{scope.row.refEnginRecordNo}}</span>
                 <span>{{scope.row.refEnginRecordNo}}</span>
@@ -168,7 +168,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>
@@ -193,7 +193,7 @@
                 {{scope.row.payAmount | numToFixed}}
                 {{scope.row.payAmount | numToFixed}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="返利钱包" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div v-if="scope.row.examineStatus === 'OK'">{{scope.row.payRebateAmount | numToFixed}}</div>
                 <div v-if="scope.row.examineStatus === 'OK'">{{scope.row.payRebateAmount | numToFixed}}</div>
@@ -205,7 +205,7 @@
                 {{ scope.row.discAmount | numToFixed }}
                 {{ scope.row.discAmount | numToFixed }}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>

+ 14 - 14
src/views/supply/engin/engin_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine">
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-checkbox-group v-model="screenForm.status" @change="getList()">
                   <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-checkbox-button>
                   <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-checkbox-button>
                 </el-checkbox-group>
                 </el-checkbox-group>
               </el-form-item>
               </el-form-item>
@@ -67,7 +67,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -85,8 +85,8 @@
 
 
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -96,7 +96,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'engin-info-order/export'" :exParams="exParams" />
             <ExportButton :exUrl="'engin-info-order/export'" :exParams="exParams" />
@@ -113,7 +113,12 @@
             stripe
             stripe
             show-summary
             show-summary
             :summary-method="$getSummaries">
             :summary-method="$getSummaries">
-            <el-table-column align="left" label="工程信息单" prop="enginInfoNo" min-width="220" show-overflow-tooltip>
+            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.examineStatus | statusFilter}}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="工程信息单" prop="enginInfoNo" min-width="200" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginInfoNo" />
                 <CopyButton :copyText="scope.row.enginInfoNo" />
                 <span>{{scope.row.enginInfoNo}}</span>
                 <span>{{scope.row.enginInfoNo}}</span>
@@ -133,7 +138,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -160,7 +165,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>
@@ -177,11 +182,6 @@
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核日期" prop="confirmTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="审核状态" prop="examineStatus" min-width="100" show-overflow-tooltip>
-              <template slot-scope="scope">
-                {{scope.row.examineStatus | statusFilter}}
-              </template>
-            </el-table-column>
             <el-table-column align="center" label="操作" width="180" fixed="right">
             <el-table-column align="center" label="操作" width="180" fixed="right">
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <el-popconfirm
                 <el-popconfirm

+ 11 - 11
src/views/supply/engin/home_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-checkbox-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-checkbox-group v-model="screenForm.status" @change="getList()">
                   <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-checkbox-button>
                   <el-checkbox-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-checkbox-button>
                 </el-checkbox-group>
                 </el-checkbox-group>
               </el-form-item>
               </el-form-item>
@@ -62,7 +62,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -75,8 +75,8 @@
 
 
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -86,8 +86,8 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
-            <el-button size="small" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button size="mini" type="danger" icon="el-icon-minus" :disabled="multipleSelection.length < 1" @click="batchDelete()" v-if="$checkBtnRole('del', $route.meta.roles)">批量删除</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'engin-order/export'" :exParams="exParams" />
             <ExportButton :exUrl="'engin-order/export'" :exParams="exParams" />
@@ -111,7 +111,7 @@
                 {{scope.row.examineStatus | statusFilter}}
                 {{scope.row.examineStatus | statusFilter}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="工程订单号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <span>{{scope.row.enginOrderNo}}</span>
                 <span>{{scope.row.enginOrderNo}}</span>
@@ -157,7 +157,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>
@@ -182,7 +182,7 @@
                 {{scope.row.payAmount | numToFixed}}
                 {{scope.row.payAmount | numToFixed}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="返利钱包" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="返利钱包" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
             <el-table-column align="right" label="使用返利金额" prop="rebateAmount" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div v-if="scope.row.examineStatus === 'OK'">{{scope.row.payRebateAmount | numToFixed}}</div>
                 <div v-if="scope.row.examineStatus === 'OK'">{{scope.row.payRebateAmount | numToFixed}}</div>
@@ -194,7 +194,7 @@
                 {{ scope.row.discAmount | numToFixed }}
                 {{ scope.row.discAmount | numToFixed }}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="业务员" prop="serviceName" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="100" show-overflow-tooltip></el-table-column>

+ 7 - 7
src/views/supply/implement/implement_list.vue

@@ -3,11 +3,11 @@
     <div>
     <div>
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
               </el-form-item>
               </el-form-item>
@@ -73,8 +73,8 @@
             
             
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-col :xs="24" :sm="24" :lg="12" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -100,7 +100,7 @@
             :summary-method="$getSummaries">
             :summary-method="$getSummaries">
             <el-table-column align="left" label="下单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="下单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="受订日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="受订日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="销售订单" prop="id" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="销售订单" prop="id" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
                 <span>{{scope.row.id}}</span>
@@ -112,7 +112,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -137,7 +137,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 8 - 8
src/views/supply/pickup/check.vue

@@ -2,12 +2,12 @@
   <div class="app-container">
   <div class="app-container">
 
 
     <div v-show="!isShowPrint">
     <div v-show="!isShowPrint">
-      <div class="main-title">
+      <div class="main-title" style="margin-top: 0;">
         <div class="title">仓库提货确认</div>
         <div class="title">仓库提货确认</div>
       </div>
       </div>
 
 
       <div>
       <div>
-        <el-form ref="screenForm" :model="screenForm" label-width="96px" size="small" label-position="right">
+        <el-form ref="screenForm" :model="screenForm" label-width="96px" size="mini" label-position="right">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="8" :lg="6">
             <el-col :xs="24" :sm="8" :lg="6">
               <el-form-item label="提货人手机号" prop="phone">
               <el-form-item label="提货人手机号" prop="phone">
@@ -15,7 +15,7 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="3" :lg="3">
             <el-col :xs="24" :sm="3" :lg="3">
-              <el-button size="small" type="primary" @click="getCode" :disabled="!screenForm.phone || countDown != 60">{{countDown == 60 ? getCodeText : '重新获取('+countDown+'s)'}}</el-button>
+              <el-button size="mini" type="primary" @click="getCode" :disabled="!screenForm.phone || countDown != 60">{{countDown == 60 ? getCodeText : '重新获取('+countDown+'s)'}}</el-button>
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="8" :lg="8">
             <el-col :xs="24" :sm="8" :lg="8">
               <el-form-item label="验证码" prop="code">
               <el-form-item label="验证码" prop="code">
@@ -23,7 +23,7 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="3" :lg="3">
             <el-col :xs="24" :sm="3" :lg="3">
-              <el-button size="small" type="primary" :disabled="!screenForm.phone || !screenForm.code" @click="getPickupManInfo">确 认</el-button>
+              <el-button size="mini" type="primary" :disabled="!screenForm.phone || !screenForm.code" @click="getPickupManInfo">确 认</el-button>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
           <el-row :gutter="20">
           <el-row :gutter="20">
@@ -38,13 +38,13 @@
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="3" :lg="3">
             <el-col :xs="24" :sm="3" :lg="3">
-              <el-button size="small" type="primary" @click="getList">查 询</el-button>
+              <el-button size="mini" type="primary" @click="getList">查 询</el-button>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
               </el-form-item>
               </el-form-item>
@@ -86,7 +86,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -133,7 +133,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 9 - 9
src/views/supply/pickup/pickup_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowForm">
     <div v-show="!isShowForm">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="申请发货单号" prop="orderNum">
               <el-form-item label="申请发货单号" prop="orderNum">
@@ -36,8 +36,8 @@
             
             
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -47,7 +47,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'pick/export'" :exParams="exParams" />
             <ExportButton :exUrl="'pick/export'" :exParams="exParams" />
@@ -61,13 +61,13 @@
               </template>
               </template>
             </el-table-column>
             </el-table-column>
             <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="120" show-overflow-tooltip>
+            <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.informationKey" />
                 <CopyButton :copyText="scope.row.informationKey" />
                 <span>{{scope.row.informationKey}}</span>
                 <span>{{scope.row.informationKey}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="发货申请单号" prop="invoiceId" min-width="130" show-overflow-tooltip>
+            <el-table-column align="left" label="发货申请单号" prop="invoiceId" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.invoiceId" />
                 <CopyButton :copyText="scope.row.invoiceId" />
                 <span>{{scope.row.invoiceId}}</span>
                 <span>{{scope.row.invoiceId}}</span>
@@ -94,13 +94,13 @@
                 {{ scope.row.theTime | dateToDayFilter }}
                 {{ scope.row.theTime | dateToDayFilter }}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="190" show-overflow-tooltip>
+            <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.mainOrderId" />
                 <CopyButton :copyText="scope.row.mainOrderId" />
                 <span>{{scope.row.mainOrderId}}</span>
                 <span>{{scope.row.mainOrderId}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="工程编号" prop="enginOrderNo" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <CopyButton :copyText="scope.row.enginOrderNo" />
                 <span>{{scope.row.enginOrderNo}}</span>
                 <span>{{scope.row.enginOrderNo}}</span>
@@ -125,7 +125,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 1 - 1
src/views/supply/pickup/statistics.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="app-container">
   <div class="app-container">
-    <div class="main-title">
+    <div class="main-title" style="margin-top: 0;">
       <div class="title">仓库预约统计看板</div>
       <div class="title">仓库预约统计看板</div>
     </div>
     </div>
 
 

+ 6 - 6
src/views/supply/pickup/sum_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="screen-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="申请发货单号" prop="orderNum">
             <el-form-item label="申请发货单号" prop="orderNum">
@@ -40,8 +40,8 @@
           
           
           <el-col :xs="24" :sm="12" :lg="18" class="tr">
           <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -62,7 +62,7 @@
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="打单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="120" show-overflow-tooltip>
+          <el-table-column align="left" label="信息密钥" prop="informationKey" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.informationKey" />
               <CopyButton :copyText="scope.row.informationKey" />
               <span>{{scope.row.informationKey}}</span>
               <span>{{scope.row.informationKey}}</span>
@@ -95,7 +95,7 @@
               {{ scope.row.theTime | dateToDayFilter }}
               {{ scope.row.theTime | dateToDayFilter }}
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="190" show-overflow-tooltip>
+          <el-table-column align="left" label="销售订单号" prop="mainOrderId" min-width="180" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.mainOrderId" />
               <CopyButton :copyText="scope.row.mainOrderId" />
               <span>{{scope.row.mainOrderId}}</span>
               <span>{{scope.row.mainOrderId}}</span>
@@ -125,7 +125,7 @@
               <span>{{scope.row.materialName}}</span>
               <span>{{scope.row.materialName}}</span>
             </template>
             </template>
           </el-table-column>
           </el-table-column>
-          <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               <CopyButton :copyText="scope.row.specification" />
               <CopyButton :copyText="scope.row.specification" />
               <span>{{scope.row.specification}}</span>
               <span>{{scope.row.specification}}</span>

+ 4 - 4
src/views/supply/purchase/enter_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="入库单号" prop="orderNum">
               <el-form-item label="入库单号" prop="orderNum">
@@ -41,8 +41,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -98,7 +98,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="uom" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="uom" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.uom" />
                 <CopyButton :copyText="scope.row.uom" />
                 <span>{{scope.row.uom}}</span>
                 <span>{{scope.row.uom}}</span>

+ 34 - 13
src/views/supply/purchase/plan_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="screen-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="采购计划单号" prop="orderNum">
             <el-form-item label="采购计划单号" prop="orderNum">
@@ -35,8 +35,8 @@
           
           
           <el-col :xs="24" :sm="12" :lg="18" class="tr">
           <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-form-item label="">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -51,16 +51,37 @@
       </div>
       </div>
       <div class="table">
       <div class="table">
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
         <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe>
-          <el-table-column align="center" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="销售类型" prop="saleName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="金额" prop="amount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="状态" prop="status" min-width="100" show-overflow-tooltip>
+          <el-table-column align="left" label="单据号" prop="billNo" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="销售类型" prop="saleName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialNumber" />
+              <span>{{scope.row.materialNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialOldNumber" />
+              <span>{{scope.row.materialOldNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialName" />
+              <span>{{scope.row.materialName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.specification" />
+              <span>{{scope.row.specification}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="金额" prop="amount" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="状态" prop="status" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
             <template slot-scope="scope">
               {{scope.row.status | statusFilter}}
               {{scope.row.status | statusFilter}}
             </template>
             </template>

+ 4 - 4
src/views/supply/purchase/purchase_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail">
     <div v-show="!isShowDetail">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务类型" prop="business">
               <el-form-item label="业务类型" prop="business">
@@ -31,8 +31,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -86,7 +86,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>

+ 39 - 8
src/views/supply/purchase/sum_list.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
   <div class="app-container">
     <!-- 筛选条件 -->
     <!-- 筛选条件 -->
     <div class="screen-container">
     <div class="screen-container">
-      <el-form ref="screenForm" :model="screenForm" label-width="100px" size="small" label-position="left">
+      <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
         <el-row :gutter="20">
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="销售单号" prop="orderNum">
             <el-form-item label="销售单号" prop="orderNum">
@@ -50,8 +50,8 @@
           
           
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
           <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-form-item label="">
             <el-form-item label="">
-              <el-button size="small" @click="resetScreenForm">清空</el-button>
-              <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+              <el-button @click="resetScreenForm">清空</el-button>
+              <el-button type="primary" @click="submitScreenForm">搜索</el-button>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
@@ -74,15 +74,46 @@
             </template>
             </template>
           </el-table-column>
           </el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="销售类型" prop="saleName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品编码" prop="materialNumber" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="120" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialNumber" />
+              <span>{{scope.row.materialNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialOldNumber" />
+              <span>{{scope.row.materialOldNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.materialName" />
+              <span>{{scope.row.materialName}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.specification" />
+              <span>{{scope.row.specification}}</span>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="数量" prop="number" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单价" prop="price" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="金额" prop="amount" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="金额" prop="amount" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="center" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.customerNumber" />
+              <span>{{scope.row.customerNumber}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <CopyButton :copyText="scope.row.customerName" />
+              <span>{{scope.row.customerName}}</span>
+            </template>
+          </el-table-column>
         </el-table>
         </el-table>
       </div>
       </div>
     </div>
     </div>

+ 7 - 7
src/views/supply/reserve/reserve_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowForm">
     <div v-show="!isShowDetail && !isShowForm">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="85px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
@@ -81,8 +81,8 @@
             
             
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
             <el-col :xs="24" :sm="12" :lg="6" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -92,7 +92,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'reserve/export'" :exParams="exParams" />
             <ExportButton :exUrl="'reserve/export'" :exParams="exParams" />
@@ -150,7 +150,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>
@@ -168,7 +168,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>

+ 24 - 24
src/views/supply/retail/retail_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
     <div v-show="!isShowDetail && !isShowForm && !isShowExamine && !isShowReturn">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="70px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="status" label-width="0">
               <el-form-item prop="status" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
@@ -66,7 +66,7 @@
             </el-col>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
               <el-form-item label="业务员" prop="salesMan">
-                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" size="small" clearable filterable style="width: 100%">
+                <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
                   <el-option
                   <el-option
                     v-for="item in salesmanList"
                     v-for="item in salesmanList"
                     :key="item.adminUserId"
                     :key="item.adminUserId"
@@ -79,8 +79,8 @@
 
 
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
             <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -90,7 +90,7 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toForm()" v-if="$checkBtnRole('add', $route.meta.roles)">新增</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'retail/export'" :exParams="exParams" />
             <ExportButton :exUrl="'retail/export'" :exParams="exParams" />
@@ -122,7 +122,7 @@
                 {{scope.row.isInvoicing ? '已开票':'未开票'}}
                 {{scope.row.isInvoicing ? '已开票':'未开票'}}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="订单号" prop="id" min-width="150" show-overflow-tooltip>
+            <el-table-column align="left" label="订单号" prop="id" min-width="140" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.id" />
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{scope.row.id}}</span>
                 <span>{{scope.row.id}}</span>
@@ -155,7 +155,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>
@@ -186,7 +186,7 @@
                 {{ scope.row.payAmount | numToFixed }}
                 {{ scope.row.payAmount | numToFixed }}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="返利类型" prop="customerWalletName2" min-width="140" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="返利类型" prop="customerWalletName2" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="返利金额" prop="rebateAmount" min-width="110" sortable show-overflow-tooltip>
             <el-table-column align="right" label="返利金额" prop="rebateAmount" min-width="110" sortable show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <div>{{scope.row.rebateAmount | numToFixed}}</div>
                 <div>{{scope.row.rebateAmount | numToFixed}}</div>
@@ -202,7 +202,7 @@
                 {{ scope.row.totalDiscAmount | numToFixed }}
                 {{ scope.row.totalDiscAmount | numToFixed }}
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="业务员" prop="k3ServiceName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表人" prop="createName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="制表日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="审核人" prop="examineName" min-width="100" show-overflow-tooltip></el-table-column>
@@ -230,6 +230,20 @@
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   v-if="$checkBtnRole('examine', $route.meta.roles) && scope.row.examineStatus === 'OK'" >
                   <el-button slot="reference" type="text">弃审</el-button>
                   <el-button slot="reference" type="text">弃审</el-button>
                 </el-popconfirm>
                 </el-popconfirm>
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定关闭吗?" 
+                  @onConfirm="handleClose(scope.row.id)" 
+                  v-if="$checkBtnRole('examine', $route.meta.roles) && !scope.row.closeTime && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'WAIT')" >
+                  <el-button slot="reference" type="text">关闭</el-button>
+                </el-popconfirm>
+                <el-popconfirm 
+                  style="margin-right: 10px;" 
+                  title="确定删除吗?" 
+                  @onConfirm="handleDelete(scope.row.id)" 
+                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
+                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
+                </el-popconfirm>
                 <el-button 
                 <el-button 
                   type="text" 
                   type="text" 
                   @click="toExamine(scope.row)" 
                   @click="toExamine(scope.row)" 
@@ -253,20 +267,6 @@
                   @click="toDetail(scope.row)">
                   @click="toDetail(scope.row)">
                   详情
                   详情
                 </el-button>
                 </el-button>
-                <el-popconfirm 
-                  style="margin-left: 10px;" 
-                  title="确定关闭吗?" 
-                  @onConfirm="handleClose(scope.row.id)" 
-                  v-if="$checkBtnRole('examine', $route.meta.roles) && !scope.row.closeTime && (scope.row.examineStatus === 'SAVE' || scope.row.examineStatus === 'WAIT')" >
-                  <el-button slot="reference" type="text">关闭</el-button>
-                </el-popconfirm>
-                <el-popconfirm 
-                  style="margin-left: 10px;" 
-                  title="确定删除吗?" 
-                  @onConfirm="handleDelete(scope.row.id)" 
-                  v-if="$checkBtnRole('del', $route.meta.roles) && scope.row.examineStatus === 'SAVE'" >
-                  <el-button slot="reference" type="text" style="color: #f56c6c;">删除</el-button>
-                </el-popconfirm>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
           </el-table>
           </el-table>

+ 9 - 9
src/views/supply/sales/sales_list.vue

@@ -3,11 +3,11 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
     <div v-show="!isShowDetail && !isShowExamine && !isShowReturnForm">
       <!-- 筛选条件 -->
       <!-- 筛选条件 -->
       <div class="screen-container">
       <div class="screen-container">
-        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="small" label-position="left">
+        <el-form ref="screenForm" :model="screenForm" label-width="90px" size="mini" label-position="left">
           <el-row :gutter="20">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="24" :lg="24">
             <el-col :xs="24" :sm="24" :lg="24">
               <el-form-item prop="orderNum" label-width="0">
               <el-form-item prop="orderNum" label-width="0">
-                <el-radio-group v-model="screenForm.status" size="medium" @change="getList()">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button label="">全部</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                   <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
                 </el-radio-group>
                 </el-radio-group>
@@ -64,8 +64,8 @@
             
             
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
             <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
               <el-form-item label="">
-                <el-button size="small" @click="resetScreenForm">清空</el-button>
-                <el-button size="small" type="primary" @click="submitScreenForm">搜索</el-button>
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -75,8 +75,8 @@
       <div class="mymain-container">
       <div class="mymain-container">
         <div class="btn-group clearfix">
         <div class="btn-group clearfix">
           <div class="fl">
           <div class="fl">
-            <el-button size="small" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
-            <el-button size="small" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
+            <el-button size="mini" type="primary" icon="el-icon-plus" @click="toReturnForm()" v-if="$checkBtnRole('add', $route.meta.roles)">退货申请</el-button>
+            <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>
           </div>
           </div>
           <div class="fr">
           <div class="fr">
             <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
             <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
@@ -111,7 +111,7 @@
                 <span>{{scope.row.id}}</span>
                 <span>{{scope.row.id}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
+            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="120" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.orderNo" />
                 <CopyButton :copyText="scope.row.orderNo" />
                 <span>{{scope.row.orderNo}}</span>
                 <span>{{scope.row.orderNo}}</span>
@@ -124,7 +124,7 @@
                 <span>{{scope.row.customerNumber}}</span>
                 <span>{{scope.row.customerNumber}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
                 <span>{{scope.row.customerName}}</span>
@@ -148,7 +148,7 @@
                 <span>{{scope.row.materialName}}</span>
                 <span>{{scope.row.materialName}}</span>
               </template>
               </template>
             </el-table-column>
             </el-table-column>
-            <el-table-column align="left" label="规格型号" prop="specification" min-width="180" show-overflow-tooltip>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
               <template slot-scope="scope">
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.specification" />
                 <CopyButton :copyText="scope.row.specification" />
                 <span>{{scope.row.specification}}</span>
                 <span>{{scope.row.specification}}</span>