Merge branch 'purchaseDev' into 'dev'

Purchase dev

See merge request new-business/drp-web!76

src/api/business/purchase/purchase-order.js

@@ -1,4 +1,5 @@
 import request from "@/utils/request";
+import axios from "axios";
 
 // 采购订单修订列表
 const list = (data, page) => {
@@ -97,6 +98,20 @@ const toNc = (data) => {
     data,
   });
 }
+// 付款协议  https://sy.derom.com/apiproxy/service/ssoRegServlet?userCode=000156&busiCenter=001
+const payRequest = (userCode) => {
+
+  return new Promise(resolve => {
+    // 当前 Promise 的状态由传入的 Promise 去决定
+    axios.get(`/sy-derom/apiproxy/service/ssoRegServlet?userCode=${userCode}&busiCenter=001`)
+    .then(res =>{
+      if(res.status == 200){
+        resolve(res.data)
+      }
+    })
+  })
+  
+}
 
 export default {
   list,
@@ -110,5 +125,6 @@ export default {
   documentsReturn,
   close,
   toNc,
+  payRequest,
 
 }

src/components/Refers/refers.vue

@@ -92,7 +92,7 @@ export default {
         console.log('res', res)
         this.dataList = res.rows;
         this.total = res.total
-        if(res.rows[0].orgName) {
+        if(res.rows.length !== 0 && res.rows[0].orgName) {
           this.orgName = true
         } else {
           this.orgName = false

src/views/purchase/DemandSummary/add.vue

@@ -15,29 +15,29 @@
           max-height="680"
           @selection-change="handleSelectionChange"
         >
-        <el-table-column type="selection" width="55" />
-        <el-table-column label="序号" align="center" type="index"/>
-        <el-table-column label="行号" align="center" prop="rowNo"/>
-        <el-table-column label="物料编码" align="center" prop="materialCode"/>
-        <el-table-column label="品名" align="center" prop="materialName"/>
-        <el-table-column label="规格" align="center" prop="specification"/>
-        <el-table-column label="单位" align="center" prop="unit"/>
-        <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer"/>
-        <el-table-column label="末级供应仓库存量" align="center" prop="lastWarehouseQty"/>
-        <el-table-column label="月销量" align="center" prop="totalMonthlySales"/>
-        <el-table-column label="采购周期" align="center" prop="buyPeriod"/>
-        <el-table-column label="最终净需求量" align="center" prop="resDemandQty"/>
-        <el-table-column label="最终采购量" align="center" prop="puQtyRes"/>
-        <el-table-column label="需求客户" align="center" prop="customerName"/>
-        <el-table-column label="最小订货量" align="center" prop="minOrderQty"/>
-        <el-table-column label="最小包装量" align="center" prop="minPackage"/>
-        <el-table-column label="最小批量" align="center" prop="minBatch"/>
-        <el-table-column label="修改人" align="center" prop="updateByName"/>
-        <el-table-column label="修改原因" align="center" prop="updateCause"/>
-        <el-table-column label="业务备注" align="center" prop="remark"/>
-        <el-table-column label="有效期" align="center" prop="expiry"/>
-        <el-table-column label="要求交货日期" align="center" prop="deliveryDate"/>
-        <el-table-column label="紧急标识" align="center" prop="isUrgency">
+        <el-table-column show-overflow-tooltip type="selection" width="55" />
+        <el-table-column show-overflow-tooltip label="序号" align="center" type="index"/>
+        <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowNo"/>
+        <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode"/>
+        <el-table-column show-overflow-tooltip label="品名" align="center" prop="materialName" width="180"/>
+        <el-table-column show-overflow-tooltip label="规格" align="center" prop="specification"/>
+        <el-table-column show-overflow-tooltip label="单位" align="center" prop="unit"/>
+        <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150"/>
+        <el-table-column show-overflow-tooltip label="末级供应仓库存量" align="center" prop="lastWarehouseQty" width="150"/>
+        <el-table-column show-overflow-tooltip label="月销量" align="center" prop="totalMonthlySales"/>
+        <el-table-column show-overflow-tooltip label="采购周期" align="center" prop="buyPeriod"/>
+        <el-table-column show-overflow-tooltip label="最终净需求量" align="center" prop="resDemandQty" width="150"/>
+        <el-table-column show-overflow-tooltip label="最终采购量" align="center" prop="puQtyRes" width="150"/>
+        <el-table-column show-overflow-tooltip label="需求客户" align="center" prop="customerName"/>
+        <el-table-column show-overflow-tooltip label="最小订货量" align="center" prop="minOrderQty" width="150"/>
+        <el-table-column show-overflow-tooltip label="最小包装量" align="center" prop="minPackage" width="150"/>
+        <el-table-column show-overflow-tooltip label="最小批量" align="center" prop="minBatch" width="150"/>
+        <el-table-column show-overflow-tooltip label="修改人" align="center" prop="updateByName" width="150"/>
+        <el-table-column show-overflow-tooltip label="修改原因" align="center" prop="updateCause" width="150"/>
+        <el-table-column show-overflow-tooltip label="业务备注" align="center" prop="remark" width="150"/>
+        <el-table-column show-overflow-tooltip label="有效期" align="center" prop="expiry" width="150"/>
+        <el-table-column show-overflow-tooltip label="要求交货日期" align="center" prop="deliveryDate" width="150"/>
+        <el-table-column show-overflow-tooltip label="紧急标识" align="center" prop="isUrgency">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isUrgency"
@@ -49,7 +49,7 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="补单标识" align="center" prop="isReplenishment">
+        <el-table-column show-overflow-tooltip label="补单标识" align="center" prop="isReplenishment">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isReplenishment"
@@ -61,27 +61,27 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="需求单单号" align="center" prop="code"/>
-        <el-table-column label="供应仓库" align="center" prop="lastWarehouseName"/>
-        <el-table-column label="供应货位" align="center" prop="lastAllocationName"/>
-        <el-table-column label="业务类型" align="center" prop="billType"/>
-        <el-table-column label="行状态" align="center" prop="status"/>
-        <el-table-column label="收货仓库" align="center" prop="deliveryWarehouseName"/>
-        <el-table-column label="收货货位" align="center" prop="deliveryAllocationName"/>
-        <el-table-column label="采购员" align="center" prop="buyerName"/>
-        <el-table-column label="制单人" align="center" prop="billMaker"/>
-        <el-table-column label="审核人员" align="center" prop="approver"/>
-        <!-- <el-table-column label="请购单号" align="center" prop="code"/> -->
-        <el-table-column label="品类" align="center" prop="materialCategory"/>
-        <el-table-column label="注册人" align="center" prop="registrant"/>
-        <el-table-column label="集团预测分类" align="center" prop="forecastClassify"/>
-        <el-table-column label="修改时间" align="center" prop="updateTime"/>
-        <el-table-column label="采购员编码" align="center" prop="buyer"/>
-        <el-table-column label="采购组织" align="center" prop="orgName"/>
-        <el-table-column label="有效期单位" align="center" prop="expiryUnit"/>
-        <!-- <el-table-column label="业务部门" align="center" prop="businessDeptName"/> -->
-        <el-table-column label="需求部门" align="center" prop="demandDeptName"/>
-        <el-table-column label="批号锁定标识" align="center" prop="isBatchLock">
+        <el-table-column show-overflow-tooltip label="需求单单号" align="center" prop="code" width="150"/>
+        <el-table-column show-overflow-tooltip label="供应仓库" align="center" prop="lastWarehouseName" width="150"/>
+        <el-table-column show-overflow-tooltip label="供应货位" align="center" prop="lastAllocationName" width="150"/>
+        <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" width="150"/>
+        <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" width="150"/>
+        <el-table-column show-overflow-tooltip label="收货仓库" align="center" prop="deliveryWarehouseName" width="150"/>
+        <el-table-column show-overflow-tooltip label="收货货位" align="center" prop="deliveryAllocationName" width="150"/>
+        <el-table-column show-overflow-tooltip label="采购员" align="center" prop="buyerName" width="150"/>
+        <el-table-column show-overflow-tooltip label="制单人" align="center" prop="billMaker" width="150"/>
+        <el-table-column show-overflow-tooltip label="审核人员" align="center" prop="approver" width="150"/>
+        <!-- <el-table-column show-overflow-tooltip label="请购单号" align="center" prop="code"/> -->
+        <el-table-column show-overflow-tooltip label="品类" align="center" prop="materialCategory" width="150"/>
+        <el-table-column show-overflow-tooltip label="注册人" align="center" prop="registrant" width="150"/>
+        <el-table-column show-overflow-tooltip label="集团预测分类" align="center" prop="forecastClassify" width="150"/>
+        <el-table-column show-overflow-tooltip label="修改时间" align="center" prop="updateTime" width="150"/>
+        <el-table-column show-overflow-tooltip label="采购员编码" align="center" prop="buyer" width="150"/>
+        <el-table-column show-overflow-tooltip label="采购组织" align="center" prop="orgName" width="150"/>
+        <el-table-column show-overflow-tooltip label="有效期单位" align="center" prop="expiryUnit" width="150"/>
+        <!-- <el-table-column show-overflow-tooltip label="业务部门" align="center" prop="businessDeptName"/> -->
+        <el-table-column show-overflow-tooltip label="需求部门" align="center" prop="demandDeptName" width="150"/>
+        <el-table-column show-overflow-tooltip label="批号锁定标识" align="center" prop="isBatchLock" width="150">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.isBatchLock"
@@ -93,17 +93,17 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="采购需求单审批人" align="center" prop="approveName"/>
-        <el-table-column label="需求单审批时间" align="center" prop="approverFinishTime"/>
-        <el-table-column label="需求单提交时间" align="center" prop="createTime"/>
-        <el-table-column label="需求单提交人" align="center" prop="createByName"/>
-        <!-- <el-table-column label="处理需求时间" align="center" prop="processTime"/> -->
-        <!-- <el-table-column label="处理需求人员" align="center" prop="processPersonal"/> -->
-        <el-table-column label="处理确认人" align="center" prop="affirmer"/>
-        <el-table-column label="处理确认时间" align="center" prop="affirmerTime"/>
-        <!-- <el-table-column label="转请购时间" align="center" prop="code"/>
-        <el-table-column label="转请购人员" align="center" prop="code"/> -->
-        <el-table-column label="价格类型" align="center" prop="priceType"/>
+        <el-table-column show-overflow-tooltip label="采购需求单审批人" align="center" prop="approveName" width="150"/>
+        <el-table-column show-overflow-tooltip label="需求单审批时间" align="center" prop="approverFinishTime" width="150"/>
+        <el-table-column show-overflow-tooltip label="需求单提交时间" align="center" prop="createTime" width="150"/>
+        <el-table-column show-overflow-tooltip label="需求单提交人" align="center" prop="createByName" width="150"/>
+        <!-- <el-table-column show-overflow-tooltip label="处理需求时间" align="center" prop="processTime"/> -->
+        <!-- <el-table-column show-overflow-tooltip label="处理需求人员" align="center" prop="processPersonal"/> -->
+        <el-table-column show-overflow-tooltip label="处理确认人" align="center" prop="affirmer" width="150"/>
+        <el-table-column show-overflow-tooltip label="处理确认时间" align="center" prop="affirmerTime" width="150"/>
+        <!-- <el-table-column show-overflow-tooltip label="转请购时间" align="center" prop="code"/>
+        <el-table-column show-overflow-tooltip label="转请购人员" align="center" prop="code"/> -->
+        <el-table-column show-overflow-tooltip label="价格类型" align="center" prop="priceType" width="150"/>
       </el-table>
     </el-card>
 

src/views/purchase/DemandSummary/index.vue

@@ -269,79 +269,79 @@
           :key="isUpdate"
         >
           <el-table-column type="selection" width="60" />
-          <el-table-column label="行状态" align="center" prop="status" width="120px" :formatter="hangStatus"/>
-          <el-table-column label="一级品类" align="center" prop="materialClassifyOneName" width="120px"/>
-          <el-table-column label="物料编码" align="center" prop="materialCode" width="180px"/>
-          <el-table-column label="品名" align="center" prop="materialName" width="180px"/>
-          <el-table-column label="规格" align="center" prop="specification" width="200px"/>
-          <el-table-column label="单位" align="center" prop="unit"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="180px"/>
-          <el-table-column label="需求单位数" align="center" prop="demandNum" width="120px"/>
-          <el-table-column label="近1月月均需求" align="center" prop="evensalesforyear" width="120px"/>
-          <el-table-column label="近3月月均需求" align="center" prop="evensalesforthrmonth" width="120px"/>
-          <el-table-column label="总最终净需求量" align="center" prop="netDemandNum" width="120px"/>
-          <el-table-column label="总月销量" align="center" prop="totalMonthlySales"/>
-          <el-table-column label="需求可用周期" align="center" prop="demandCycle" width="180px"/>
-          <el-table-column label="呆滞量" align="center" prop="dullQut"/>
-          <el-table-column label="采购周期" align="center" prop="buyPeriod"/>
-          <el-table-column label="中心公共库存" align="center" prop="centralPublicStock" width="120px"/>
-          <el-table-column label="中心仓专属货位" align="center" prop="centralWarehouse" width="120px"/>
-          <el-table-column label="区域分仓公共库存" align="center" prop="regionPublicStock" width="130px"/>
-          <el-table-column label="各项目仓库存" align="center" prop="eachWarehouseStock" width="120px"/>
-          <el-table-column label="电商仓库" align="center" prop="commerceWarehouse"/>
-          <el-table-column label="采购在途" align="center" prop="buyTransit"/>
-          <el-table-column label="借出在途" align="center" prop="lendTransit"/>
-          <el-table-column label="调拨在途" align="center" prop="transferTransit"/>
-          <el-table-column label="库存总计" align="center" prop="stockTotal"/>
-          <el-table-column label="最小包装量" align="center" prop="minPackage" width="100px"/>
-          <el-table-column label="最小订货量" align="center" prop="minOrder" width="100px"/>
-          <el-table-column label="最小批量" align="center" prop="minBatch"/>
-          <el-table-column label="人工调整数" align="center" prop="artificialAdjust" width="100px"/>
-          <el-table-column label="修改原因" align="center" prop="modifyReason" width="150px">
+          <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" width="120px" :formatter="hangStatus"/>
+          <el-table-column show-overflow-tooltip label="一级品类" align="center" prop="materialClassifyOneName" width="120px"/>
+          <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="180px"/>
+          <el-table-column show-overflow-tooltip label="品名" align="center" prop="materialName" width="180px"/>
+          <el-table-column show-overflow-tooltip label="规格" align="center" prop="specification" width="200px"/>
+          <el-table-column show-overflow-tooltip label="单位" align="center" prop="unit"/>
+          <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="180px"/>
+          <el-table-column show-overflow-tooltip label="需求单位数" align="center" prop="demandNum" width="120px"/>
+          <el-table-column show-overflow-tooltip label="近1月月均需求" align="center" prop="evensalesforyear" width="120px"/>
+          <el-table-column show-overflow-tooltip label="近3月月均需求" align="center" prop="evensalesforthrmonth" width="120px"/>
+          <el-table-column show-overflow-tooltip label="总最终净需求量" align="center" prop="netDemandNum" width="120px"/>
+          <el-table-column show-overflow-tooltip label="总月销量" align="center" prop="totalMonthlySales"/>
+          <el-table-column show-overflow-tooltip label="需求可用周期" align="center" prop="demandCycle" width="180px"/>
+          <el-table-column show-overflow-tooltip label="呆滞量" align="center" prop="dullQut"/>
+          <el-table-column show-overflow-tooltip label="采购周期" align="center" prop="buyPeriod"/>
+          <el-table-column show-overflow-tooltip label="中心公共库存" align="center" prop="centralPublicStock" width="120px"/>
+          <el-table-column show-overflow-tooltip label="中心仓专属货位" align="center" prop="centralWarehouse" width="120px"/>
+          <el-table-column show-overflow-tooltip label="区域分仓公共库存" align="center" prop="regionPublicStock" width="130px"/>
+          <el-table-column show-overflow-tooltip label="各项目仓库存" align="center" prop="eachWarehouseStock" width="120px"/>
+          <el-table-column show-overflow-tooltip label="电商仓库" align="center" prop="commerceWarehouse"/>
+          <el-table-column show-overflow-tooltip label="采购在途" align="center" prop="buyTransit"/>
+          <el-table-column show-overflow-tooltip label="借出在途" align="center" prop="lendTransit"/>
+          <el-table-column show-overflow-tooltip label="调拨在途" align="center" prop="transferTransit"/>
+          <el-table-column show-overflow-tooltip label="库存总计" align="center" prop="stockTotal"/>
+          <el-table-column show-overflow-tooltip label="最小包装量" align="center" prop="minPackage" width="100px"/>
+          <el-table-column show-overflow-tooltip label="最小订货量" align="center" prop="minOrder" width="100px"/>
+          <el-table-column show-overflow-tooltip label="最小批量" align="center" prop="minBatch"/>
+          <el-table-column show-overflow-tooltip label="人工调整数" align="center" prop="artificialAdjust" width="100px"/>
+          <el-table-column show-overflow-tooltip label="修改原因" align="center" prop="modifyReason" width="150px">
             <template slot-scope="scope">
                 <el-input :disabled="lineDisable" v-model="scope.row.modifyReason"/>
             </template>
           </el-table-column>
-          <el-table-column label="建议采购量" align="center" prop="suggestionPurchase" width="100px"/>
-          <el-table-column label="建议净采购量" align="center" prop="suggestBuyQty" width="100px"/>
-          <el-table-column label="最终采购量" align="center" prop="finalBuyQty" width="150">
+          <el-table-column show-overflow-tooltip label="建议采购量" align="center" prop="suggestionPurchase" width="100px"/>
+          <el-table-column show-overflow-tooltip label="建议净采购量" align="center" prop="suggestBuyQty" width="100px"/>
+          <el-table-column show-overflow-tooltip label="最终采购量" align="center" prop="finalBuyQty" width="150">
             <template slot-scope="scope">
                 <el-input :disabled="lineDisable" v-model="scope.row.finalBuyQty"/>
             </template>
           </el-table-column>
-          <el-table-column label="二级品类" align="center" prop="materialClassifyTwoName" width="150px"/>
-          <el-table-column label="三级品类" align="center" prop="materialClassifyThreeName" width="150px"/>
-          <el-table-column label="四级品类" align="center" prop="materialClassifyFourName" width="150px"/>
-          <el-table-column label="采购员" align="center" prop="buyerName" width="150px">
+          <el-table-column show-overflow-tooltip label="二级品类" align="center" prop="materialClassifyTwoName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="三级品类" align="center" prop="materialClassifyThreeName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="四级品类" align="center" prop="materialClassifyFourName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="采购员" align="center" prop="buyerName" width="150px">
             <template slot-scope="scope">
                 <el-input :disabled="lineDisable" size="small" v-model="scope.row.buyerName">
                   <el-button size="small" :disabled="lineDisable" slot="append" icon="el-icon-more" @click="chooseSon(scope.$index, 'CONTACTS_PARAM', true, '采购员')"></el-button>
                 </el-input>
             </template>
           </el-table-column>
-          <el-table-column label="默认采购组织" align="center" prop="purchaseOrgName" width="280px">
+          <el-table-column show-overflow-tooltip label="默认采购组织" align="center" prop="purchaseOrgName" width="280px">
             <template slot-scope="scope">
                 <el-input :disabled="lineDisable" size="small" v-model="scope.row.purchaseOrgName">
                   <el-button size="small" :disabled="lineDisable" slot="append" icon="el-icon-more" @click="chooseSon(scope.$index, 'ORG_PARAM', true, '默认采购组织')"></el-button>
                 </el-input>
             </template>
           </el-table-column>
-          <el-table-column label="有效期" align="center" prop="validityPeriod"/>
-          <el-table-column label="有效期单位" align="center" prop="validityPeriodUnit" width="100px"/>
-          <el-table-column label="业务类型" align="center" prop="businessType" :formatter="formatterBusinessType"/>
-          <el-table-column label="安全库存量" align="center" prop="safetyStock" width="100px"/>
-          <el-table-column label="单据来源" align="center" prop="billSource"/>
-          <el-table-column label="行号" align="center" prop="rowNo"/>
-          <el-table-column label="注册人" align="center" prop="registrant"/>
+          <el-table-column show-overflow-tooltip label="有效期" align="center" prop="validityPeriod"/>
+          <el-table-column show-overflow-tooltip label="有效期单位" align="center" prop="validityPeriodUnit" width="100px"/>
+          <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="businessType" :formatter="formatterBusinessType"/>
+          <el-table-column show-overflow-tooltip label="安全库存量" align="center" prop="safetyStock" width="100px"/>
+          <el-table-column show-overflow-tooltip label="单据来源" align="center" prop="billSource"/>
+          <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowNo"/>
+          <el-table-column show-overflow-tooltip label="注册人" align="center" prop="registrant"/>
           <!-- <el-table-column label="可用量" align="center" prop="qty"/> -->
-          <el-table-column label="总需与终采差异" align="center" prop="buyDiscrepancy" width="120px"/>
-          <el-table-column label="集团预测分类" align="center" prop="forecastClassification" width="100px"/>
-          <el-table-column label="中心仓占有量" align="center" prop="centerBinPossession" width="100px"/>
-          <el-table-column label="中心仓可用量" align="center" prop="centralWarehouseAvailable" width="100px"/>
+          <el-table-column show-overflow-tooltip label="总需与终采差异" align="center" prop="buyDiscrepancy" width="120px"/>
+          <el-table-column show-overflow-tooltip label="集团预测分类" align="center" prop="forecastClassification" width="100px"/>
+          <el-table-column show-overflow-tooltip label="中心仓占有量" align="center" prop="centerBinPossession" width="100px"/>
+          <el-table-column show-overflow-tooltip label="中心仓可用量" align="center" prop="centralWarehouseAvailable" width="100px"/>
           <!-- <el-table-column label="物料类别" align="center" prop="materialCategory" width="150px"/> -->
           <!-- <el-table-column label="业务部门" align="center" prop="departmentName" width="150px"/> -->
-          <el-table-column label="需求单位" align="center" prop="demandUnit"/>
-          <el-table-column label="采购经理审核人" align="center" prop="puManagerAuditor" width="120px"/>
+          <el-table-column show-overflow-tooltip label="需求单位" align="center" prop="demandUnit"/>
+          <el-table-column show-overflow-tooltip label="采购经理审核人" align="center" prop="puManagerAuditor" width="120px"/>
           <el-table-column
           fixed="right"
           label="操作"

src/views/purchase/MaterialClassDivision/index.vue

@@ -212,25 +212,25 @@
           max-height="480"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column label="物料分类编码" align="center" prop="materialClassify"/>
-          <el-table-column label="物料分类名称" align="center" width="200" prop="materialClassifyName" />
-          <el-table-column label="一级分类名称" align="center" prop="materialClassifyOneName" />
-          <el-table-column label="二级分类名称" align="center" width="150" prop="materialClassifyTwoName" />
-          <el-table-column label="三级分类名称" align="center" width="150" prop="materialClassifyThreeName"/>
-          <el-table-column label="四级分类名称" align="center" width="150" prop="materialClassifyFourName" />
-          <el-table-column label="物料编码" align="center" width="150" prop="material" />
-          <el-table-column label="物料名称" align="center" prop="materialName" />
-          <el-table-column label="生产厂商" align="center" width="150" prop="manufacturer" />
-          <el-table-column label="所属组织" align="center" width="120" prop="orgName"/>
-          <el-table-column label="订单员" align="center" width="150" prop="orderPersonalName" />
-          <el-table-column label="采购员" align="center" width="150" prop="buyerName" />
-          <el-table-column label="订单部门" align="center" width="150" prop="orderDeptName" />
-          <el-table-column label="部门" align="center" width="150" prop="puDeptName" />
-          <el-table-column label="创建人" align="center" width="150" prop="createdByName" />
-          <el-table-column label="创建时间" align="center" width="150" prop="createdTime" />
-          <el-table-column label="修改人" align="center" width="150" prop="updatedByName" />
-          <el-table-column label="修改时间" align="center" width="150" prop="updatedTime" />
+          <el-table-column show-overflow-tooltip type="selection" width="55" />
+          <el-table-column show-overflow-tooltip label="物料分类编码" align="center" prop="materialClassify"/>
+          <el-table-column show-overflow-tooltip label="物料分类名称" align="center" width="200" prop="materialClassifyName" />
+          <el-table-column show-overflow-tooltip label="一级分类名称" align="center" prop="materialClassifyOneName" />
+          <el-table-column show-overflow-tooltip label="二级分类名称" align="center" width="150" prop="materialClassifyTwoName" />
+          <el-table-column show-overflow-tooltip label="三级分类名称" align="center" width="150" prop="materialClassifyThreeName"/>
+          <el-table-column show-overflow-tooltip label="四级分类名称" align="center" width="150" prop="materialClassifyFourName" />
+          <el-table-column show-overflow-tooltip label="物料编码" align="center" width="150" prop="material" />
+          <el-table-column show-overflow-tooltip label="物料名称" align="center" prop="materialName" />
+          <el-table-column show-overflow-tooltip label="生产厂商" align="center" width="150" prop="manufacturer" />
+          <el-table-column show-overflow-tooltip label="所属组织" align="center" width="120" prop="orgName"/>
+          <el-table-column show-overflow-tooltip label="订单员" align="center" width="150" prop="orderPersonalName" />
+          <el-table-column show-overflow-tooltip label="采购员" align="center" width="150" prop="buyerName" />
+          <el-table-column show-overflow-tooltip label="订单部门" align="center" width="150" prop="orderDeptName" />
+          <el-table-column show-overflow-tooltip label="部门" align="center" width="150" prop="puDeptName" />
+          <el-table-column show-overflow-tooltip label="创建人" align="center" width="150" prop="createdByName" />
+          <el-table-column show-overflow-tooltip label="创建时间" align="center" width="150" prop="createdTime" />
+          <el-table-column show-overflow-tooltip label="修改人" align="center" width="150" prop="updatedByName" />
+          <el-table-column show-overflow-tooltip label="修改时间" align="center" width="150" prop="updatedTime" />
           <el-table-column
           fixed="right"
           label="操作"

src/views/purchase/PurchaseDemandList/add.vue

@@ -163,42 +163,42 @@
           max-height="300"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection"/>
-          <el-table-column label="序号" type="index" align="center"/>
-          <el-table-column label="行状态" align="center" prop="status" :formatter="hangStatus" width="150px"/>
-          <el-table-column label="行号" align="center" prop="rowNo" />
-          <!-- <el-table-column label="业务部门名称" align="center" width="180px"/> -->
-          <!-- <el-table-column label="业务部门" align="center" width="180px"/> -->
-          <el-table-column label="需求客户" align="center"  prop="demandCustomerName" width="200px"/>
-          <el-table-column label="一级品类" align="center" prop="materialClassifyOneName" width="180px">
+          <el-table-column show-overflow-tooltip type="selection"/>
+          <el-table-column show-overflow-tooltip label="序号" type="index" align="center"/>
+          <el-table-column show-overflow-tooltip label="行状态" align="center" prop="status" :formatter="hangStatus" width="150px"/>
+          <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowNo" />
+          <!-- <el-table-column show-overflow-tooltip label="业务部门名称" align="center" width="180px"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="业务部门" align="center" width="180px"/> -->
+          <el-table-column show-overflow-tooltip label="需求客户" align="center"  prop="demandCustomerName" width="200px"/>
+          <el-table-column show-overflow-tooltip label="一级品类" align="center" prop="materialClassifyOneName" width="180px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.materialClassifyOneName"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="二级品类" align="center" prop="materialClassifyTwoName" width="180px">
+          <el-table-column show-overflow-tooltip label="二级品类" align="center" prop="materialClassifyTwoName" width="180px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.materialClassifyTwoName"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="三级品类" align="center" prop="materialClassifyThreeName" width="180px">
+          <el-table-column show-overflow-tooltip label="三级品类" align="center" prop="materialClassifyThreeName" width="180px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.materialClassifyThreeName"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="四级品类" align="center" prop="materialClassifyFourName" width="180px">
+          <el-table-column show-overflow-tooltip label="四级品类" align="center" prop="materialClassifyFourName" width="180px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.materialClassifyFourName"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="预留比例" align="center" prop="reservedProportion" width="150px">
+          <el-table-column show-overflow-tooltip label="预留比例" align="center" prop="reservedProportion" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-select clearable :disabled="sonDisable" size="small" v-model="scope.row.reservedProportion">
@@ -209,23 +209,23 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="预留周期" align="center" prop="reservedPeriod" width="150px">
+          <el-table-column show-overflow-tooltip label="预留周期" align="center" prop="reservedPeriod" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.reservedPeriod"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="预留数量" align="center"  prop="reservedQty" width="150px">
+          <el-table-column show-overflow-tooltip label="预留数量" align="center"  prop="reservedQty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.reservedQty"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="采购员名称" align="center" prop="buyerName" width="120px"/>
-          <el-table-column label="采购员" align="center"  prop="buyer"/>
-          <el-table-column label="物料编码" align="center" prop="materialCode" width="230px">
+          <el-table-column show-overflow-tooltip label="采购员名称" align="center" prop="buyerName" width="120px"/>
+          <el-table-column show-overflow-tooltip label="采购员" align="center"  prop="buyer"/>
+          <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="materialCode" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.materialCode" @focus="chooseMaterial(scope.$index)">
@@ -234,42 +234,42 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" align="center"  prop="materialName" width="230px" />
-          <el-table-column label="规格" align="center"  prop="specification" />
-          <el-table-column label="型号" align="center"  prop="model"/>
-          <el-table-column label="单位" align="center"  prop="unitName"/>
-          <el-table-column label="生产厂家/代理人" align="center"  prop="manufacturerName" width="230px"/>
-          <el-table-column label="注册人" align="center"  prop="registrant" width="150px"/>
-          <el-table-column label="采购周期" align="center"  prop="puPeriod" width="150px">
+          <el-table-column show-overflow-tooltip label="物料名称" align="center"  prop="materialName" width="230px" />
+          <el-table-column show-overflow-tooltip label="规格" align="center"  prop="specification" />
+          <el-table-column show-overflow-tooltip label="型号" align="center"  prop="model"/>
+          <el-table-column show-overflow-tooltip label="单位" align="center"  prop="unitName"/>
+          <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center"  prop="manufacturerName" width="230px"/>
+          <el-table-column show-overflow-tooltip label="注册人" align="center"  prop="registrant" width="150px"/>
+          <el-table-column show-overflow-tooltip label="采购周期" align="center"  prop="puPeriod" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.puPeriod"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="有效期" align="center"  prop="expiry" width="120px"/>
-          <el-table-column label="有效期单位" align="center"  prop="expiryUnit" width="120px"/>
-          <el-table-column label="最小包装" align="center"  prop="minPackage" width="120px"/>
-          <el-table-column label="最小订货量" align="center"  prop="minOrderQty" width="120px"/>
-          <el-table-column label="最小批量" align="center"  prop="minBatch" width="120px"/>
-          <el-table-column label="安全库存" align="center"  prop="safeStock" width="120px">
+          <el-table-column show-overflow-tooltip label="有效期" align="center"  prop="expiry" width="120px"/>
+          <el-table-column show-overflow-tooltip label="有效期单位" align="center"  prop="expiryUnit" width="120px"/>
+          <el-table-column show-overflow-tooltip label="最小包装" align="center"  prop="minPackage" width="120px"/>
+          <el-table-column show-overflow-tooltip label="最小订货量" align="center"  prop="minOrderQty" width="120px"/>
+          <el-table-column show-overflow-tooltip label="最小批量" align="center"  prop="minBatch" width="120px"/>
+          <el-table-column show-overflow-tooltip label="安全库存" align="center"  prop="safeStock" width="120px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.safeStock"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="月均销量" align="center"  prop="averageQtyMonth" width="120px"/>
-          <el-table-column label="实际(业务)需求量" align="center"  prop="qty" width="120px">
+          <el-table-column show-overflow-tooltip label="月均销量" align="center"  prop="averageQtyMonth" width="120px"/>
+          <el-table-column show-overflow-tooltip label="实际(业务)需求量" align="center"  prop="qty" width="120px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.qty"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="需求可用周期" align="center"  prop="demandPeriod" width="120px"/>
-          <el-table-column label="集团预测分类" align="center"  prop="forecastClassify" width="120px"/>
-          <el-table-column label="交货日期" align="center"  prop="deliveryDate" width="230px">
+          <el-table-column show-overflow-tooltip label="需求可用周期" align="center"  prop="demandPeriod" width="120px"/>
+          <el-table-column show-overflow-tooltip label="集团预测分类" align="center"  prop="forecastClassify" width="120px"/>
+          <el-table-column show-overflow-tooltip label="交货日期" align="center"  prop="deliveryDate" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-date-picker
@@ -284,7 +284,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="补单标识" align="center"  prop="isReplenishment" width="100px">
+          <el-table-column show-overflow-tooltip label="补单标识" align="center"  prop="isReplenishment" width="100px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-switch
@@ -298,7 +298,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="批号锁定标识" align="center" prop="isBatchLock" width="100px">
+          <el-table-column show-overflow-tooltip label="批号锁定标识" align="center" prop="isBatchLock" width="100px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                   <el-switch
@@ -312,24 +312,24 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="业务备注" align="center"  prop="remark" width="150px">
+          <el-table-column show-overflow-tooltip label="业务备注" align="center"  prop="remark" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.remark"/>
               </el-form-item>
             </template>
           </el-table-column> 
-          <el-table-column label="采购备注" align="center"  prop="puRemark" width="150px"/>
-          <!-- <el-table-column label="末级供应仓库存量" align="center"  prop="lastWarehouseQty" /> -->
-          <el-table-column label="调拨占有量" align="center"  prop="superiorAllotQty" width="150px"/>
-          <el-table-column label="最终净需求量" align="center"  prop="resDemandQty" width="150px">
+          <el-table-column show-overflow-tooltip label="采购备注" align="center"  prop="puRemark" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="末级供应仓库存量" align="center"  prop="lastWarehouseQty" /> -->
+          <el-table-column show-overflow-tooltip label="调拨占有量" align="center"  prop="superiorAllotQty" width="150px"/>
+          <el-table-column show-overflow-tooltip label="最终净需求量" align="center"  prop="resDemandQty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :readonly="sonDisable" size="small" v-model="scope.row.resDemandQty"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="收货仓库" align="center"  prop="deliveryWarehouseName" width="200px">
+          <el-table-column show-overflow-tooltip label="收货仓库" align="center"  prop="deliveryWarehouseName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.deliveryWarehouseName" @clear="clearHang(scope.$index, '选择收货仓库')" @focus="chooseDept(scope.$index, 'WAREHOUSE_PARAM', true, '选择收货仓库')">
@@ -338,7 +338,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="收货货位" align="center"  prop="deliveryAllocationName" width="200px">
+          <el-table-column show-overflow-tooltip label="收货货位" align="center"  prop="deliveryAllocationName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.deliveryAllocationName" @clear="clearHang(scope.$index, '选择收货货位')" @focus="choosehuoWei(scope.$index, 'ALLOCATION_PARAM', true, '选择收货货位', scope.row.deliveryWarehouse)">
@@ -347,10 +347,10 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="收货货位编码" align="center"  prop="deliveryAllocation" width="200px"/> -->
-          <el-table-column label="末级供应仓库" align="center"  prop="lastWarehouseName" width="200px"/>
-          <el-table-column label="末级供应货位" align="center"  prop="lastAllocationName" width="200px"/>
-          <el-table-column label="紧急标识" align="center" prop="isUrgency" width="100px">
+          <!-- <el-table-column show-overflow-tooltip label="收货货位编码" align="center"  prop="deliveryAllocation" width="200px"/> -->
+          <el-table-column show-overflow-tooltip label="末级供应仓库" align="center"  prop="lastWarehouseName" width="200px"/>
+          <el-table-column show-overflow-tooltip label="末级供应货位" align="center"  prop="lastAllocationName" width="200px"/>
+          <el-table-column show-overflow-tooltip label="紧急标识" align="center" prop="isUrgency" width="100px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-switch
@@ -364,13 +364,13 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="默认采购组织" align="center"  prop="purOrgName" width="200px"/>yu
-          <el-table-column label="默认采购组织编码" align="center"  prop="puOrg" width="200px"/>
-          <!-- <el-table-column label="末级供应调拨待入量" align="center"  prop="lastStockQty" width="150px"/> -->
-          <!-- <el-table-column label="上级供应中心现存量" align="center"  prop="superiorCenterQty" width="200px"/> -->
-          <el-table-column label="上级库存被调拨占用量" align="center"  prop="superiorAllotQty" width="200px"/>
-          <!-- <el-table-column label="可用量" align="center"  prop="availableQty"/> -->
-          <el-table-column label="调拨状态" align="center"  prop="statusAllot" width="100px">
+          <el-table-column show-overflow-tooltip label="默认采购组织" align="center"  prop="purOrgName" width="200px"/>yu
+          <el-table-column show-overflow-tooltip label="默认采购组织编码" align="center"  prop="puOrg" width="200px"/>
+          <!-- <el-table-column show-overflow-tooltip label="末级供应调拨待入量" align="center"  prop="lastStockQty" width="150px"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="上级供应中心现存量" align="center"  prop="superiorCenterQty" width="200px"/> -->
+          <el-table-column show-overflow-tooltip label="上级库存被调拨占用量" align="center"  prop="superiorAllotQty" width="200px"/>
+          <!-- <el-table-column show-overflow-tooltip label="可用量" align="center"  prop="availableQty"/> -->
+          <el-table-column show-overflow-tooltip label="调拨状态" align="center"  prop="statusAllot" width="100px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-switch
@@ -384,7 +384,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="补单供应商编码" align="center"  prop="additionalSupplier" width="200px">
+          <el-table-column show-overflow-tooltip label="补单供应商编码" align="center"  prop="additionalSupplier" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable || BDZT" size="small" v-model="scope.row.additionalSupplier" @clear="clearHang(scope.$index, '选择补单供应商')" @focus="chooseDept(scope.$index, 'SUPPLIER_PARAM', true, '选择补单供应商')">
@@ -393,14 +393,14 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="补单供应商名称" align="center"  prop="additionalSupplierName" width="200px">
+          <el-table-column show-overflow-tooltip label="补单供应商名称" align="center"  prop="additionalSupplierName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.additionalSupplierName"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="周期单位" align="center"  prop="periodUnit" width="150px">
+          <!-- <el-table-column show-overflow-tooltip label="周期单位" align="center"  prop="periodUnit" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-select clearable :disabled="sonDisable" size="small" v-model="scope.row.periodUnit">
@@ -410,10 +410,10 @@
               </el-form-item>
             </template>
           </el-table-column> -->
-          <el-table-column label="末级供应库存组织" align="center" prop="superiorStockOrgName" width="200px"></el-table-column>
-          <el-table-column label="中心仓可用量" align="center"  prop="centralWarehouseQty" width="200px"/>
-          <el-table-column label="调拨单号" align="center"  prop="allotCode"></el-table-column>
-          <el-table-column label="收货地址" align="center"  prop="deliveryAddressName" width="200px">
+          <el-table-column show-overflow-tooltip label="末级供应库存组织" align="center" prop="superiorStockOrgName" width="200px"></el-table-column>
+          <el-table-column show-overflow-tooltip label="中心仓可用量" align="center"  prop="centralWarehouseQty" width="200px"/>
+          <el-table-column show-overflow-tooltip label="调拨单号" align="center"  prop="allotCode"></el-table-column>
+          <el-table-column show-overflow-tooltip label="收货地址" align="center"  prop="deliveryAddressName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.deliveryAddressName" @clear="clearHang(scope.$index, '选择收货地址')" @focus="chooseDept(scope.$index, 'ADDRESS_PARAM', true, '选择收货地址')">
@@ -422,11 +422,11 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="收货地址编码" align="center" prop="deliveryAddress" width="200px"></el-table-column>
-          <el-table-column label="联系人" align="center"  prop="contacts"/>
-          <el-table-column label="联系人电话" align="center"  prop="contactsPhone" width="200px"/>
-          <el-table-column label="详细地址" align="center"  prop="address" width="200px"/>
-          <el-table-column label="价格类型" align="center"  prop="priceType" width="150px">
+          <el-table-column show-overflow-tooltip label="收货地址编码" align="center" prop="deliveryAddress" width="200px"></el-table-column>
+          <el-table-column show-overflow-tooltip label="联系人" align="center"  prop="contacts"/>
+          <el-table-column show-overflow-tooltip label="联系人电话" align="center"  prop="contactsPhone" width="200px"/>
+          <el-table-column show-overflow-tooltip label="详细地址" align="center"  prop="address" width="200px"/>
+          <el-table-column show-overflow-tooltip label="价格类型" align="center"  prop="priceType" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-select clearable :disabled="sonDisable" size="small" v-model="scope.row.priceType">
@@ -725,6 +725,8 @@ export default {
         periodUnit: null,
         demandCustomer: this.basicForm.customer,
         demandCustomerName: this.basicForm.customerName,
+        businessDept: this.basicForm.demandDept,
+        businessDeptName: null,
         lastStockOrg: null,
         lastStockOrgName: null,
         superiorStockOrg: null,

src/views/purchase/PurchaseDemandList/index.vue

@@ -94,6 +94,21 @@
             </el-form-item>
           </el-col>
           <el-col :span="1.5">
+            <el-form-item label="审批结束日期">
+              <el-date-picker
+                v-model="queryParams.approverFinishTime"
+                type="date"
+                clearable
+                value-format="yyyy-MM-dd"
+                size="small"
+                style="width: 200px"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="10">
+          <el-col :span="1.5">
             <el-form-item label="备注">
             <el-input
               v-model.trim="queryParams.remark"
@@ -142,21 +157,22 @@
           max-height="350"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column label="编码" align="center" width="200" prop="code"/>
-          <el-table-column label="需求日期" align="center" width="120" prop="demandDate"/>
-          <el-table-column label="单据状态" align="center" prop="satus" :formatter="formatterStatus"/>
-          <!-- <el-table-column label="是否已处理需求" align="center" width="150" prop="isProcess" /> -->
-          <el-table-column label="业务类型" align="center" prop="billType" :formatter="formatterBillType"/>
-          <!-- <el-table-column label="是否特殊需求" align="center" width="150" prop="isSpeical" /> -->
-          <el-table-column label="需求人员" align="center" prop="demandPersonalName" />
-          <el-table-column label="需求客户" align="center" prop="customerName" width="150"/>
-          <el-table-column label="需求部门" align="center" prop="demandDeptName" width="150"/>
-          <!-- <el-table-column label="供应仓库" align="center" width="120" prop="warehouseName" /> -->
-          <!-- <el-table-column label="供应货位" align="center" width="150" prop="goodsAllocationName" /> -->
-          <el-table-column label="单据来源" align="center" prop="source" width="120" :formatter="formatterSource"/>
-          <el-table-column label="组织" align="center" width="200" prop="orgName"/>
-          <el-table-column label="备注" align="center" width="150" prop="remark" />
+          <el-table-column show-overflow-tooltip type="selection" width="55" />
+          <el-table-column show-overflow-tooltip label="编码" align="center" width="200" prop="code"/>
+          <el-table-column show-overflow-tooltip label="需求日期" align="center" width="120" prop="demandDate"/>
+          <el-table-column show-overflow-tooltip label="审批结束日期" align="center" width="150" prop="approverFinishTime"/>
+          <el-table-column show-overflow-tooltip label="单据状态" align="center" prop="satus" :formatter="formatterStatus"/>
+          <!-- <el-table-column show-overflow-tooltip label="是否已处理需求" align="center" width="150" prop="isProcess" /> -->
+          <el-table-column show-overflow-tooltip label="业务类型" align="center" prop="billType" :formatter="formatterBillType"/>
+          <!-- <el-table-column show-overflow-tooltip label="是否特殊需求" align="center" width="150" prop="isSpeical" /> -->
+          <el-table-column show-overflow-tooltip label="需求人员" align="center" prop="demandPersonalName" />
+          <el-table-column show-overflow-tooltip label="需求客户" align="center" prop="customerName" width="150"/>
+          <el-table-column show-overflow-tooltip label="需求部门" align="center" prop="demandDeptName" width="150"/>
+          <!-- <el-table-column show-overflow-tooltip label="供应仓库" align="center" width="120" prop="warehouseName" /> -->
+          <!-- <el-table-column show-overflow-tooltip label="供应货位" align="center" width="150" prop="goodsAllocationName" /> -->
+          <el-table-column show-overflow-tooltip label="单据来源" align="center" prop="source" width="120" :formatter="formatterSource"/>
+          <el-table-column show-overflow-tooltip label="组织" align="center" width="200" prop="orgName"/>
+          <el-table-column show-overflow-tooltip label="备注" align="center" width="150" prop="remark" />
           <el-table-column
           fixed="right"
           label="操作"
@@ -266,6 +282,7 @@ export default {
         billType: '',
         demandDept: '',
         demandDate: '',
+        approverFinishTime: '',
         remark: '',
         pageNum: 1,
         pageSize: 5

src/views/purchase/deliveryAddress/index.vue

@@ -173,23 +173,23 @@
           max-height="480"
           @selection-change="handleSelectionChange"
         >
-          <el-table-column type="selection" width="55" />
-          <el-table-column label="仓库属性" align="center" prop="warehouseProperty"/>
-          <el-table-column label="仓库档案名称" align="center" width="200" prop="warehouseCode"/>
-          <el-table-column label="收货仓库编码" align="center" prop="code" />
-          <el-table-column label="收货仓库名称" align="center" width="150" prop="name"/>
-          <el-table-column label="详细地址" align="center" width="150" prop="address"/>
-          <el-table-column label="物料分类" align="center" width="150" prop="materialClassifyName" />
-          <el-table-column label="联系人" align="center" width="150" prop="contactsName" />
-          <el-table-column label="联系人电话" align="center" prop="contactsPhone" />
-          <el-table-column label="NC档案ID" align="center" width="150" prop="createTime" />
-          <el-table-column label="备注" align="center" width="120" prop="remark" />
-          <el-table-column label="创建人" align="center" width="150" prop="createByName" />
-          <el-table-column label="创建时间" align="center" width="150" prop="createTime" />
-          <el-table-column label="修改人" align="center" width="150" prop="updateByName" />
-          <el-table-column label="修改时间" align="center" width="150" prop="updateTime" />
-          <el-table-column label="同步状态" align="center" width="150" prop="sendStatus" />
-          <el-table-column label="启用" align="center" width="150" prop="status" />
+          <el-table-column show-overflow-tooltip type="selection" width="55" />
+          <el-table-column show-overflow-tooltip label="仓库属性" align="center" prop="warehouseProperty"/>
+          <el-table-column show-overflow-tooltip label="仓库档案名称" align="center" width="200" prop="warehouseCode"/>
+          <el-table-column show-overflow-tooltip label="收货仓库编码" align="center" prop="code" />
+          <el-table-column show-overflow-tooltip label="收货仓库名称" align="center" width="150" prop="name"/>
+          <el-table-column show-overflow-tooltip label="详细地址" align="center" width="150" prop="address"/>
+          <el-table-column show-overflow-tooltip label="物料分类" align="center" width="150" prop="materialClassifyName" />
+          <el-table-column show-overflow-tooltip label="联系人" align="center" width="150" prop="contactsName" />
+          <el-table-column show-overflow-tooltip label="联系人电话" align="center" prop="contactsPhone" />
+          <el-table-column show-overflow-tooltip label="NC档案ID" align="center" width="150" prop="createTime" />
+          <el-table-column show-overflow-tooltip label="备注" align="center" width="120" prop="remark" />
+          <el-table-column show-overflow-tooltip label="创建人" align="center" width="150" prop="createByName" />
+          <el-table-column show-overflow-tooltip label="创建时间" align="center" width="150" prop="createTime" />
+          <el-table-column show-overflow-tooltip label="修改人" align="center" width="150" prop="updateByName" />
+          <el-table-column show-overflow-tooltip label="修改时间" align="center" width="150" prop="updateTime" />
+          <el-table-column show-overflow-tooltip label="同步状态" align="center" width="150" prop="sendStatus" />
+          <el-table-column show-overflow-tooltip label="启用" align="center" width="150" prop="status" />
           <el-table-column
           fixed="right"
           label="操作"

src/views/purchase/purchase-order/add/column.js

@@ -373,7 +373,7 @@ export const TabColumns = [
     key: 'puOrderItemList',
     tableColumns: [
       { key: "rowNo", title: "行号", inputType: "Input", },
-      { key: "orderId", title: "采购订单ID", inputType: "Input", width: 180 },
+      // { key: "orderId", title: "采购订单ID", inputType: "Input", width: 180 },
       // {key: "material",title: "物料",inputType: "Input",   },
       {
         key: "materialName",

src/views/purchase/purchase-order/column.js

@@ -139,7 +139,7 @@ export const TabColumns = [
     key: 'puOrderItemList',
     tableColumns: [
       { key: "rowNo", title: "行号" },
-      { key: "orderId", title: "采购订单ID" },
+      // { key: "orderId", title: "采购订单ID" },
       { key: "material", title: "物料" },
       { key: "materialName", title: "物料名称", width: 180 },
       { key: "materialCode", title: "物料编码", width: 180 },
@@ -247,7 +247,12 @@ export const TabColumns = [
         inputType: "Select",
         referName: "sys_price_type", // 字典名
       },
-      { key: "isDistributionPrice", title: "配送价" },
+      { 
+        key: "isDistributionPrice", 
+        title: "配送价",
+        inputType: 'Checkbox',
+        width:80,
+       },
       // { key: "tenantId", title: "租户号" },
       // { key: "revision", title: "乐观锁" },
       { key: "createByName", title: "创建人" },
@@ -269,7 +274,7 @@ export const TabColumns = [
     key: 'puOrderExecuteList',
     tableColumns: [
       // { key: "id", title: "主键" },
-      { key: "orderId", title: "采购订单ID", width: 180 },
+      // { key: "orderId", title: "采购订单ID", width: 180 },
       { key: "rowno", title: "行号" },
       { key: "material", title: "物料", width: 180 },
       { key: "materialName", title: "物料名称", width: 180 },

src/views/purchase/purchase-order/components/FileUploadCenter/index.vue

@@ -75,8 +75,8 @@ export default {
     return {
       number: 0,
       uploadList: [],
-      baseUrl: '/file',
-      uploadFileUrl: '/file' + "/document-center/fastdfs/upload", // 上传文件服务器地址
+      baseUrl: '/sy-derom',
+      uploadFileUrl: "/sy-derom/document-center/fastdfs/upload", // 上传文件服务器地址
       fileList: [],
     };
   },

src/views/purchase/purchase-order/index.vue

@@ -63,7 +63,14 @@ export default {
       } catch (err) {
         //
       } finally {
+        
         this.loading = false;
+
+        for (const key in this.tabTableDatas) {
+
+          this.tabTableDatas[key] = [];
+
+        }
       }
     },
     handleSearchChange() {
@@ -242,6 +249,27 @@ export default {
         this.loading = false;
       }
     },
+    // 付款协议
+    async handlePaymentRequest(){
+      // name:工号
+      try {
+        let {name} = this.$store.state.user;
+
+        await orderApi.payRequest(name).then(res=>{
+
+          if(res){
+
+            let url = `uclient://start/http://172.16.100.2:8081?ssoKey=${res}&uiloader=nc.uap.lfw.applet.PortalUILoader&nodeId=40040407`
+
+            window.location.href = url;
+          }
+        });
+
+      } catch (error) {
+        
+      }
+      
+    },
     handleSelect(selection, row) {
 
       this.checkedList = selection;
@@ -318,6 +346,7 @@ export default {
 
         <el-button-group style="margin-left: 10px">
           <!-- <el-button size="mini">采购退货</el-button> -->
+          <el-button size="mini" @click="handlePaymentRequest">付款申请</el-button>
 
           <!-- <el-button size="mini">附件管理</el-button>
           <el-button size="mini">单据追溯</el-button> -->

src/views/purchase/transferOrder/add.vue

@@ -231,8 +231,8 @@
           fit
           max-height="480"
           >
-          <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="物料编码" align="center" prop="material" width="230px">
+          <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+          <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="material" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.material" @focus="chooseMaterial(scope.$index)">
@@ -241,33 +241,33 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="物料名称" align="center" prop="materialName" width="200px"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="200px"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="200px"/>
-          <el-table-column label="规格" align="center" prop="specification"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="200px"/>
-          <el-table-column label="产地" align="center" prop="originPlaceName"/>
-          <el-table-column label="型号" align="center" prop="model"/>
-          <el-table-column label="单位" align="center" prop="unitName"/>
-          <!-- <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/> -->
-          <el-table-column label="数量" align="center" prop="qty" width="150px">
+          <el-table-column show-overflow-tooltip label="物料名称" align="center" prop="materialName" width="200px"/>
+          <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="200px"/>
+          <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="200px"/>
+          <el-table-column show-overflow-tooltip label="规格" align="center" prop="specification"/>
+          <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="200px"/>
+          <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlaceName"/>
+          <el-table-column show-overflow-tooltip label="型号" align="center" prop="model"/>
+          <el-table-column show-overflow-tooltip label="单位" align="center" prop="unitName"/>
+          <!-- <el-table-column show-overflow-tooltip label="调出仓库" align="center" prop="deliveryWarehouseName"/> -->
+          <el-table-column show-overflow-tooltip label="数量" align="center" prop="qty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input :readonly="sonDisable" size="small" v-model="scope.row.qty"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="主单位" align="center" prop="mainUnitName"/>
-          <el-table-column label="换算率" align="center" prop="equation"/>
-          <el-table-column label="主数量" align="center" prop="mainQty" width="150px">
+          <el-table-column show-overflow-tooltip label="主单位" align="center" prop="mainUnitName"/>
+          <el-table-column show-overflow-tooltip label="换算率" align="center" prop="equation"/>
+          <el-table-column show-overflow-tooltip label="主数量" align="center" prop="mainQty" width="150px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input :readonly="sonDisable" size="small" v-model="scope.row.mainQty"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="税率" align="center" prop="rate"/>
-          <el-table-column label="调出货位" align="center" prop="deliveryAllocationName" width="230px">
+          <el-table-column show-overflow-tooltip label="税率" align="center" prop="rate"/>
+          <el-table-column show-overflow-tooltip label="调出货位" align="center" prop="deliveryAllocationName" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.deliveryAllocationName" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '调出货位', basicForm.deliveryWarehouse)">
@@ -276,7 +276,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="调入货位" align="center" prop="storageAllocationName" width="230px">
+          <el-table-column show-overflow-tooltip label="调入货位" align="center" prop="storageAllocationName" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input clearable :disabled="sonDisable" size="small" v-model="scope.row.storageAllocationName" @focus="chooseMxHW(scope.$index, 'ALLOCATION_PARAM', true, '调入货位', basicForm.storageWarehouse)">
@@ -285,8 +285,8 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="批次号" align="center" prop="patchNo" width="150px"/>
-          <el-table-column label="产品批号" align="center" prop="producBatch" width="230px">
+          <el-table-column show-overflow-tooltip label="批次号" align="center" prop="patchNo" width="150px"/>
+          <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="producBatch" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input readonly size="small" v-model="scope.row.producBatch">
@@ -295,7 +295,7 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="230px">
+          <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-date-picker
@@ -308,8 +308,8 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-          <el-table-column label="调拨日期" align="center" prop="allotDate" width="230px">
+          <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨日期" align="center" prop="allotDate" width="230px">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-date-picker
@@ -322,26 +322,26 @@
               </el-form-item>
             </template>
           </el-table-column>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="200px"/>
-          <el-table-column label="注册证号" align="center" prop="registration" width="200px"/>
-          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-          <el-table-column label="剂型" align="center" prop="drug"/>
-          <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail" width="200px"/>
-          <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="200px"/>
-          <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
-          <el-table-column label="pi码" align="center" prop="pi">
+          <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="200px"/>
+          <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="200px"/>
+          <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug"/>
+          <el-table-column show-overflow-tooltip label="调入调出结算规则明细" align="center" prop="ruleDetail" width="200px"/>
+          <el-table-column show-overflow-tooltip label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="200px"/>
+          <el-table-column show-overflow-tooltip label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
+          <el-table-column show-overflow-tooltip label="pi码" align="center" prop="pi">
             <template slot-scope="scope">
               <el-form-item class="hang">
                 <el-input :readonly="sonDisable" size="small" v-model="scope.row.pi"/>
               </el-form-item>
             </template>
           </el-table-column>
-          <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
-          <!-- <el-table-column label="备注" align="center" prop="code"/> -->
-          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-          <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="无税金额" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="备注" align="center" prop="code"/> -->
+          <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           <el-table-column
             fixed="right"
             label="操作"
@@ -360,35 +360,35 @@
           fit
           max-height="480"
           >
-          <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-          <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName" width="150px"/>
-          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
-          <!-- <el-table-column label="收货利润中心" align="center" prop="code"/>
-          <el-table-column label="发货利润中心" align="center" prop="code"/> -->
-          <el-table-column label="调入业务员" align="center" prop="businessPersonalName" width="150px"/>
-          <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-          <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-          <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-          <el-table-column label="收货客户" align="center" prop="customerName" width="150px"/>
-          <el-table-column label="收货地址" align="center" prop="addressaddress" width="150px"/>
-          <el-table-column label="收货地区" align="center" prop="area" width="150px"/>
-          <el-table-column label="收货地点" align="center" prop="place" width="150px"/>
-          <el-table-column label="计划发货日期" align="center" prop="deliveryDate" width="150px"/>
-          <el-table-column label="计划到货日期" align="center" prop="strageDate" width="150px"/>
-          <el-table-column label="运输方式" align="center" prop="transportation" width="150px"/>
-          <el-table-column label="备注" align="center" prop="remark" width="150px"/>
-          <el-table-column label="客户物料编码" align="center" prop="customerLogistic" width="150px"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+          <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+          <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+          <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调出仓库" align="center" prop="deliveryWarehouseName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="收货利润中心" align="center" prop="code"/>
+          <el-table-column show-overflow-tooltip label="发货利润中心" align="center" prop="code"/> -->
+          <el-table-column show-overflow-tooltip label="调入业务员" align="center" prop="businessPersonalName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="productBatch" width="150px"/>
+          <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+          <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+          <el-table-column show-overflow-tooltip label="收货客户" align="center" prop="customerName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="收货地址" align="center" prop="addressaddress" width="150px"/>
+          <el-table-column show-overflow-tooltip label="收货地区" align="center" prop="area" width="150px"/>
+          <el-table-column show-overflow-tooltip label="收货地点" align="center" prop="place" width="150px"/>
+          <el-table-column show-overflow-tooltip label="计划发货日期" align="center" prop="deliveryDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="计划到货日期" align="center" prop="strageDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="运输方式" align="center" prop="transportation" width="150px"/>
+          <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户物料编码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           </el-table>
         </el-tab-pane>
 
@@ -398,31 +398,31 @@
           fit
           max-height="480"
           >
-          <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-          <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-          <!-- <el-table-column label="税率" align="center" prop="code"/> -->
-          <!-- <el-table-column label="无税单价" align="center" prop="code"/> -->
-          <!-- <el-table-column label="含税单价" align="center" prop="code"/> -->
-          <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-          <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-          <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-          <!-- <el-table-column label="询价无税价" align="center" prop="code"/> -->
-          <!-- <el-table-column label="询价含税价" align="center" prop="code"/> -->
-          <!-- <el-table-column label="税额" align="center" prop="code"/> -->
-          <!-- <el-table-column label="加价率" align="center" prop="code"/> -->
-          <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
-          <!-- <el-table-column label="价税合计" align="center" prop="code"/> -->
-          <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+          <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+          <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+          <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="税率" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="无税单价" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="含税单价" align="center" prop="code"/> -->
+          <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="productBatch" width="150px"/>
+          <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+          <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="询价无税价" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="询价含税价" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="税额" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="加价率" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="无税金额" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="价税合计" align="center" prop="code"/> -->
+          <el-table-column show-overflow-tooltip label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           </el-table>
         </el-tab-pane>
 
@@ -432,30 +432,30 @@
           fit
           max-height="480"
           >
-          <el-table-column label="行号" align="center" prop="rowno"/>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-          <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-          <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-          <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-          <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
-          <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-          <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-          <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-          <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-          <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-          <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-          <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-          <!-- <el-table-column label="已调出主数量" align="center" prop="code"/>
-          <el-table-column label="已调入主数量" align="center" prop="code"/> -->
-          <!-- <el-table-column label="调拨在途主数量" align="center" prop="code"/> -->
-          <!-- <el-table-column label="已发货主数量" align="center" prop="code"/> -->
-          <!-- <el-table-column label="途损主数量" align="center" prop="code"/> -->
-          <!-- <el-table-column label="累计退货主数量" align="center" prop="code"/> -->
-          <!-- <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/> -->
-          <!-- <el-table-column label="调出与调入已结算金额" align="center" prop="code"/> -->
-          <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
-          <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+          <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+          <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+          <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+          <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="productBatch" width="150px"/>
+          <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+          <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="已调出主数量" align="center" prop="code"/>
+          <el-table-column show-overflow-tooltip label="已调入主数量" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="调拨在途主数量" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="已发货主数量" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="途损主数量" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="累计退货主数量" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="调出与调入已结算主数量" align="center" prop="code"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="调出与调入已结算金额" align="center" prop="code"/> -->
+          <el-table-column show-overflow-tooltip label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
           </el-table>
         </el-tab-pane>
       </el-tabs>

src/views/purchase/transferOrder/index.vue

@@ -90,39 +90,39 @@
           ref="multipleTable"
           @row-click="select"
         >
-          <el-table-column label="调出库存" align="center" prop="deliveryInventoryOrgName" width="150px"/>
-          <el-table-column label="订单类型" align="center" prop="billType" width="150px"/>
-          <el-table-column label="单据号" align="center" prop="code" width="150px"/>
-          <el-table-column label="单据日期" align="center" prop="billDate" width="150px"/>
-          <el-table-column label="调拨方式" align="center" prop="allotType" width="150px">
+          <el-table-column show-overflow-tooltip label="调出库存" align="center" prop="deliveryInventoryOrgName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="订单类型" align="center" prop="billType" width="150px"/>
+          <el-table-column show-overflow-tooltip label="单据号" align="center" prop="code" width="150px"/>
+          <el-table-column show-overflow-tooltip label="单据日期" align="center" prop="billDate" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨方式" align="center" prop="allotType" width="150px">
             <template slot-scope="scope">
               <span>{{ scope.row.allotType == '2' ? '财务组织间调拨' : '财务组织内库存组织内调拨' }}</span>
             </template>
           </el-table-column>
-          <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-          <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-          <el-table-column label="调拨入库组织" align="center" prop="storageInventoryOrgName" width="150px"/>
-          <el-table-column label="调出业务员" align="center" prop="businessPersonalName" width="150px"/>
-          <el-table-column label="调出部门" align="center" prop="deliveryDeptName" width="150px"/>
-          <el-table-column label="币种" align="center" prop="currencyName"/>
-          <el-table-column label="折本汇率" align="center" prop="rate"/>
-          <el-table-column label="在途归属" align="center" prop="onRouteAffilliation" width="150px"/>
-          <el-table-column label="总数量" align="center" prop="qty"/>
-          <el-table-column label="结算路径" align="center" prop="accountPath" width="150px"/>
-          <el-table-column label="客户" align="center" prop="customerName" width="150px"/>
-          <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName" width="180px"/>
-          <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
-          <el-table-column label="物流项目组" align="center" prop="materialProject" width="150px"/>
-          <el-table-column label="利润中心" align="center" prop="liacenterName" width="150px"/>
-          <!-- <el-table-column label="已同步WMS" align="center" prop="isSendWms" width="150px"/> -->
-          <el-table-column label="备注" align="center" prop="remark" width="150px"/>
-          <el-table-column label="单据状态" align="center" prop="status" width="150px"/>
-          <el-table-column label="制单人" align="center" prop="createByName" width="150px"/>
-          <el-table-column label="制单日期" align="center" prop="createTime" width="150px"/>
-          <!-- <el-table-column label="审批人" align="center" prop="code" width="150px"/> -->
-          <!-- <el-table-column label="审批日期" align="center" prop="code" width="150px"/> -->
-          <el-table-column label="最后修改人" align="center" prop="updateByName" width="150px"/>
-          <el-table-column label="最后修改时间" align="center" prop="updateTime" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调拨入库组织" align="center" prop="storageInventoryOrgName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调出业务员" align="center" prop="businessPersonalName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调出部门" align="center" prop="deliveryDeptName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="币种" align="center" prop="currencyName"/>
+          <el-table-column show-overflow-tooltip label="折本汇率" align="center" prop="rate"/>
+          <el-table-column show-overflow-tooltip label="在途归属" align="center" prop="onRouteAffilliation" width="150px"/>
+          <el-table-column show-overflow-tooltip label="总数量" align="center" prop="qty"/>
+          <el-table-column show-overflow-tooltip label="结算路径" align="center" prop="accountPath" width="150px"/>
+          <el-table-column show-overflow-tooltip label="客户" align="center" prop="customerName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="调出仓库" align="center" prop="deliveryWarehouseName" width="180px"/>
+          <el-table-column show-overflow-tooltip label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="物流项目组" align="center" prop="materialProject" width="150px"/>
+          <el-table-column show-overflow-tooltip label="利润中心" align="center" prop="liacenterName" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="已同步WMS" align="center" prop="isSendWms" width="150px"/> -->
+          <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="150px"/>
+          <el-table-column show-overflow-tooltip label="单据状态" align="center" prop="status" width="150px"/>
+          <el-table-column show-overflow-tooltip label="制单人" align="center" prop="createByName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="制单日期" align="center" prop="createTime" width="150px"/>
+          <!-- <el-table-column show-overflow-tooltip label="审批人" align="center" prop="code" width="150px"/> -->
+          <!-- <el-table-column show-overflow-tooltip label="审批日期" align="center" prop="code" width="150px"/> -->
+          <el-table-column show-overflow-tooltip label="最后修改人" align="center" prop="updateByName" width="150px"/>
+          <el-table-column show-overflow-tooltip label="最后修改时间" align="center" prop="updateTime" width="150px"/>
           <el-table-column
           fixed="right"
           label="操作"
@@ -153,41 +153,41 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="物料编码" align="center" prop="material" width="150px"/>
-            <el-table-column label="物料名称" align="center" prop="materialName" width="150px"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-            <el-table-column label="规格" align="center" prop="specification"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-            <el-table-column label="型号" align="center" prop="model" width="150px"/>
-            <el-table-column label="单位" align="center" prop="unitName" width="150px"/>
-            <!-- <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName"/> -->
-            <el-table-column label="数量" align="center" prop="qty" width="150px"/>
-            <el-table-column label="主单位" align="center" prop="mainUnit" width="150px"/>
-            <el-table-column label="换算率" align="center" prop="equation" width="150px"/>
-            <el-table-column label="主数量" align="center" prop="mainQty" width="150px"/>
-            <el-table-column label="税率" align="center" prop="rate" width="150px"/>
-            <!-- <el-table-column label="调入仓库" align="center" prop="storageWarehouseName"/> -->
-            <el-table-column label="批次号" align="center" prop="patchNo" width="150px"/>
-            <el-table-column label="产品批号" align="center" prop="producBatch" width="150px"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-            <el-table-column label="调入调出结算规则明细" align="center" prop="ruleDetail" width="150px"/>
-            <el-table-column label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="150px"/>
-            <el-table-column label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
-            <el-table-column label="pi码" align="center" prop="pi" width="150px"/>
-            <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
-            <!-- <el-table-column label="备注" align="center" prop="code"/> -->
-            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-            <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+            <el-table-column show-overflow-tooltip label="物料编码" align="center" prop="material" width="150px"/>
+            <el-table-column show-overflow-tooltip label="物料名称" align="center" prop="materialName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="规格" align="center" prop="specification"/>
+            <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column show-overflow-tooltip label="型号" align="center" prop="model" width="150px"/>
+            <el-table-column show-overflow-tooltip label="单位" align="center" prop="unitName" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="调出仓库" align="center" prop="deliveryWarehouseName"/> -->
+            <el-table-column show-overflow-tooltip label="数量" align="center" prop="qty" width="150px"/>
+            <el-table-column show-overflow-tooltip label="主单位" align="center" prop="mainUnit" width="150px"/>
+            <el-table-column show-overflow-tooltip label="换算率" align="center" prop="equation" width="150px"/>
+            <el-table-column show-overflow-tooltip label="主数量" align="center" prop="mainQty" width="150px"/>
+            <el-table-column show-overflow-tooltip label="税率" align="center" prop="rate" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="调入仓库" align="center" prop="storageWarehouseName"/> -->
+            <el-table-column show-overflow-tooltip label="批次号" align="center" prop="patchNo" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="producBatch" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调入调出结算规则明细" align="center" prop="ruleDetail" width="150px"/>
+            <el-table-column show-overflow-tooltip label="上市许可持有人" align="center" prop="marketingApprovalPersonal" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产许可证号/经营许可证号/备案凭证号" align="center" prop="production" width="260px"/>
+            <el-table-column show-overflow-tooltip label="pi码" align="center" prop="pi" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="无税金额" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="备注" align="center" prop="code"/> -->
+            <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+            <el-table-column show-overflow-tooltip label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
 
@@ -197,35 +197,35 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-            <el-table-column label="调出仓库" align="center" prop="deliveryWarehouseName" width="150px"/>
-            <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
-            <!-- <el-table-column label="收货利润中心" align="center" prop="code"/>
-            <el-table-column label="发货利润中心" align="center" prop="code"/> -->
-            <el-table-column label="调入业务员" align="center" prop="businessPersonalName" width="150px"/>
-            <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-            <el-table-column label="收货客户" align="center" prop="customerName" width="150px"/>
-            <el-table-column label="收货地址" align="center" prop="addressaddress" width="150px"/>
-            <el-table-column label="收货地区" align="center" prop="area" width="150px"/>
-            <el-table-column label="收货地点" align="center" prop="place" width="150px"/>
-            <el-table-column label="计划发货日期" align="center" prop="deliveryDate" width="150px"/>
-            <el-table-column label="计划到货日期" align="center" prop="strageDate" width="150px"/>
-            <el-table-column label="运输方式" align="center" prop="transportation" width="150px"/>
-            <el-table-column label="备注" align="center" prop="remark" width="150px"/>
-            <el-table-column label="客户物料编码" align="center" prop="customerLogistic" width="150px"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+            <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调出仓库" align="center" prop="deliveryWarehouseName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="收货利润中心" align="center" prop="code"/>
+            <el-table-column show-overflow-tooltip label="发货利润中心" align="center" prop="code"/> -->
+            <el-table-column show-overflow-tooltip label="调入业务员" align="center" prop="businessPersonalName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="productBatch" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+            <el-table-column show-overflow-tooltip label="收货客户" align="center" prop="customerName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="收货地址" align="center" prop="addressaddress" width="150px"/>
+            <el-table-column show-overflow-tooltip label="收货地区" align="center" prop="area" width="150px"/>
+            <el-table-column show-overflow-tooltip label="收货地点" align="center" prop="place" width="150px"/>
+            <el-table-column show-overflow-tooltip label="计划发货日期" align="center" prop="deliveryDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="计划到货日期" align="center" prop="strageDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="运输方式" align="center" prop="transportation" width="150px"/>
+            <el-table-column show-overflow-tooltip label="备注" align="center" prop="remark" width="150px"/>
+            <el-table-column show-overflow-tooltip label="客户物料编码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
 
@@ -235,31 +235,31 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-            <!-- <el-table-column label="税率" align="center" prop="code"/> -->
-            <!-- <el-table-column label="无税单价" align="center" prop="code"/> -->
-            <!-- <el-table-column label="含税单价" align="center" prop="code"/> -->
-            <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-            <!-- <el-table-column label="询价无税价" align="center" prop="code"/> -->
-            <!-- <el-table-column label="询价含税价" align="center" prop="code"/> -->
-            <!-- <el-table-column label="税额" align="center" prop="code"/> -->
-            <!-- <el-table-column label="加价率" align="center" prop="code"/> -->
-            <!-- <el-table-column label="无税金额" align="center" prop="code"/> -->
-            <!-- <el-table-column label="价税合计" align="center" prop="code"/> -->
-            <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+            <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="税率" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="无税单价" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="含税单价" align="center" prop="code"/> -->
+            <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="productBatch" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="询价无税价" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="询价含税价" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="税额" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="加价率" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="无税金额" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="价税合计" align="center" prop="code"/> -->
+            <el-table-column show-overflow-tooltip label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
 
@@ -269,30 +269,30 @@
             fit
             max-height="380"
             >
-            <el-table-column label="行号" align="center" prop="rowno"/>
-            <el-table-column label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
-            <el-table-column label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
-            <el-table-column label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
-            <el-table-column label="产地" align="center" prop="originPlace" width="150px"/>
-            <el-table-column label="类别" align="center" prop="classify" width="150px"/>
-            <el-table-column label="产品批号" align="center" prop="productBatch" width="150px"/>
-            <el-table-column label="生产日期" align="center" prop="manufactureDate" width="150px"/>
-            <el-table-column label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
-            <el-table-column label="批准文号" align="center" prop="ratifyCode" width="150px"/>
-            <el-table-column label="注册证号" align="center" prop="registration" width="150px"/>
-            <el-table-column label="商品名" align="center" prop="productCode" width="150px"/>
-            <el-table-column label="通用名" align="center" prop="commonCode" width="150px"/>
-            <el-table-column label="剂型" align="center" prop="drug" width="150px"/>
-            <!-- <el-table-column label="已调出主数量" align="center" prop="code"/>
-            <el-table-column label="已调入主数量" align="center" prop="code"/> -->
-            <!-- <el-table-column label="调拨在途主数量" align="center" prop="code"/> -->
-            <!-- <el-table-column label="已发货主数量" align="center" prop="code"/> -->
-            <!-- <el-table-column label="途损主数量" align="center" prop="code"/> -->
-            <!-- <el-table-column label="累计退货主数量" align="center" prop="code"/> -->
-            <!-- <el-table-column label="调出与调入已结算主数量" align="center" prop="code"/> -->
-            <!-- <el-table-column label="调出与调入已结算金额" align="center" prop="code"/> -->
-            <el-table-column label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
-            <el-table-column label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
+            <el-table-column show-overflow-tooltip label="行号" align="center" prop="rowno"/>
+            <el-table-column show-overflow-tooltip label="调拨出库单号" align="center" prop="deliveryCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="调拨入库单号" align="center" prop="storageCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产厂家/代理人" align="center" prop="manufacturer" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产地" align="center" prop="originPlace" width="150px"/>
+            <el-table-column show-overflow-tooltip label="类别" align="center" prop="classify" width="150px"/>
+            <el-table-column show-overflow-tooltip label="产品批号" align="center" prop="productBatch" width="150px"/>
+            <el-table-column show-overflow-tooltip label="生产日期" align="center" prop="manufactureDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="有效期至/失效日期" align="center" prop="periodEndDate" width="150px"/>
+            <el-table-column show-overflow-tooltip label="批准文号" align="center" prop="ratifyCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="注册证号" align="center" prop="registration" width="150px"/>
+            <el-table-column show-overflow-tooltip label="商品名" align="center" prop="productCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="通用名" align="center" prop="commonCode" width="150px"/>
+            <el-table-column show-overflow-tooltip label="剂型" align="center" prop="drug" width="150px"/>
+            <!-- <el-table-column show-overflow-tooltip label="已调出主数量" align="center" prop="code"/>
+            <el-table-column show-overflow-tooltip label="已调入主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="调拨在途主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="已发货主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="途损主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="累计退货主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="调出与调入已结算主数量" align="center" prop="code"/> -->
+            <!-- <el-table-column show-overflow-tooltip label="调出与调入已结算金额" align="center" prop="code"/> -->
+            <el-table-column show-overflow-tooltip label="客户物料码" align="center" prop="customerLogistic" width="150px"/>
+            <el-table-column show-overflow-tooltip label="客户物料名称" align="center" prop="customerLogisticName" width="150px"/>
             </el-table>
           </el-tab-pane>
         </el-tabs>

vue.config.js

@@ -57,11 +57,11 @@ module.exports = {
         changeOrigin: true,
         pathRewrite: { [`^/drp-file`]: "" },
       },
-      "/file": {
+      "/sy-derom": {
         // target: process.env.NODE_ENV == "development" ? `https://test-sy.derom.com` : `https://sy.derom.com`,
         target: `https://sy.derom.com`,
         changeOrigin: true,
-        pathRewrite: { [`^/file`]: "" },
+        pathRewrite: { [`^/sy-derom`]: "" },
       },
     },
     disableHostCheck: true,