入库、出库、调拨、货转、货物通关费用

package.json

@@ -46,7 +46,7 @@
     "core-js": "3.6.5",
     "corps": "^0.1.0",
     "echarts": "^4.2.1",
-    "element-ui": "2.14.1",
+    "element-ui": "^2.15.13",
     "file-saver": "2.0.1",
     "fuse.js": "3.4.4",
     "js-beautify": "1.10.2",

src/views/Warehousing/components/incomeMoney.vue

@@ -654,8 +654,8 @@
         @selection-change="whgenlegSelectionChange">
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="行号" type="index" width="80"></el-table-column>
-        <el-table-column prop="fCorpname" header-align="center" align="center" label="客户名称" />
-        <el-table-column prop="fName" header-align="center" align="center" label="费用名称" />
+        <el-table-column prop="fCorpname" header-align="center" align="center" show-overflow-tooltip label="客户名称" />
+        <el-table-column prop="fName" header-align="center" align="center" show-overflow-tooltip label="费用名称" />
         <el-table-column prop="fFeeUnitid" header-align="center" align="center" width="180px" label="计价单位">
           <template slot-scope="scope">
             <el-select v-model="scope.row.fFeeUnitid" placeholder="请选择计价单位" @change="changeFeeUnit(scope.row)" disabled
@@ -666,7 +666,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="fPrice" header-align="center" align="center" label="单价" width="100px" />
-        <el-table-column prop="remark" header-align="center" align="center" label="备注" />
+        <el-table-column prop="remark" header-align="center" align="center" show-overflow-tooltip label="备注" />
       </el-table>
 
       <pagination v-show="whgenlegTotal > 0" :total="whgenlegTotal" :page.sync="pageNum" :limit.sync="pageSize"

src/views/Warehousing/components/payMoney.vue

@@ -494,8 +494,8 @@
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column label="行号" type="index" width="80">
         </el-table-column>
-        <el-table-column prop="fCorpname" header-align="center" align="center" label="客户名称" />
-        <el-table-column prop="fName" header-align="center" align="center" label="费用名称" />
+        <el-table-column prop="fCorpname" header-align="center" align="center" show-overflow-tooltip label="客户名称" />
+        <el-table-column prop="fName" header-align="center" align="center" show-overflow-tooltip label="费用名称" />
         <el-table-column prop="fFeeUnitid" header-align="center" align="center" width="180px" label="计价单位">
           <template slot-scope="scope">
             <el-select v-model="scope.row.fFeeUnitid" placeholder="请选择计价单位" @change="changeFeeUnit(scope.row)" disabled
@@ -506,7 +506,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="fPrice" header-align="center" align="center" label="单价" width="100px" />
-        <el-table-column prop="remark" header-align="center" align="center" label="备注" />
+        <el-table-column prop="remark" header-align="center" align="center" show-overflow-tooltip label="备注" />
       </el-table>
 
       <pagination v-show="whgenlegTotal > 0" :total="whgenlegTotal" :page.sync="pageNum" :limit.sync="pageSize"

src/views/Warehousing/goodsTransfer/AddOrUpdate.vue

@@ -959,13 +959,13 @@
         <el-table-column
           prop="fCorpname"
           header-align="center"
-          align="center"
+          align="center" show-overflow-tooltip
           label="客户名称"
         />
         <el-table-column
           prop="fName"
           header-align="center"
-          align="center"
+          align="center" show-overflow-tooltip
           label="费用名称"
         />
         <el-table-column
@@ -1002,7 +1002,7 @@
         <el-table-column
           prop="remark"
           header-align="center"
-          align="center"
+          align="center" show-overflow-tooltip
           label="备注"
         />
       </el-table>

src/views/Warehousing/inStock/index.vue

@@ -237,32 +237,32 @@
           <el-button type="primary" @click="save()">确 定</el-button>
         </span>
       </el-dialog>
-
-      <el-table ref="table" v-loading="loading" :data="warehousebillsList" @selection-change="handleSelectionChange"
+      <el-table ref="table" style="width: 100%;" v-loading="loading" :data="warehousebillsList" @selection-change="handleSelectionChange"
         show-summary :summary-method="getSum" :height="tableHeight" @expand-change="expandChange">
         <el-table-column type="selection" fixed align="center" width="58" />
+
         <el-table-column type="expand" fixed="left">
           <template slot-scope="props">
-            <el-table :data="props.row.dataList" v-loading="props.row.loading">
-              <el-table-column type="index" label="行号" width="50" align="center" fixed />
+            <el-table :data="props.row.dataList" v-loading="props.row.loading" style="width: 1500px;margin-left: 200px">
+              <el-table-column type="index" label="行号" width="50" align="center" />
               <el-table-column label="状态" prop="fBillstatus" align="center" show-overflow-tooltip width="100">
                 <template slot-scope="scope">
                   {{ scope.row.fBillstatus | fBillstatusFormat }}
                 </template>
               </el-table-column>
-              <el-table-column label="入库日期" prop="fBsdate" align="center" show-overflow-tooltip width="100">
+              <el-table-column label="入库日期" prop="fBsdate" align="center" show-overflow-tooltip width="120">
               </el-table-column>
-              <el-table-column label="品名" prop="fGoodsid" align="center" show-overflow-tooltip width="100">
+              <el-table-column label="品名" prop="fGoodsid" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.fGoodsid | goodsFormat(goodsOptions) }}
                 </template>
               </el-table-column>
-              <el-table-column label="货物属性" prop="fBusinessType" align="center" show-overflow-tooltip width="100">
+              <el-table-column label="货物属性" prop="fBusinessType" align="center" show-overflow-tooltip>
                 <template slot-scope="scope">
                   {{ scope.row.fBusinessType | fStorageTypeFormat(fStorageTypeOptions) }}
                 </template>
               </el-table-column>
-              <el-table-column label="属性详情" prop="fMarks" align="center" show-overflow-tooltip width="100">
+              <el-table-column label="属性详情" prop="fMarks" align="center" show-overflow-tooltip>
               </el-table-column>
               <el-table-column label="入库件数" prop="fQty" align="center" show-overflow-tooltip width="100">
               </el-table-column>
@@ -270,7 +270,7 @@
               </el-table-column>
               <el-table-column label="入库净重(kg)" prop="fNetweight" align="center" show-overflow-tooltip width="150">
               </el-table-column>
-              <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip width="180">
+              <el-table-column label="箱号" prop="fCntrno" align="center" show-overflow-tooltip>
               </el-table-column>
             </el-table>
           </template>
@@ -1109,4 +1109,25 @@ export default {
 </script>
 
 <style scoped>
+.table {
+    border-collapse: collapse;
+    border-spacing: 0;
+    background-color: transparent;
+    display: table;
+    width: 100%;
+    max-width: 100%;
+    margin: 0 auto;
+}
+
+.table td {
+    text-align: center;
+    vertical-align: middle;
+    font-size: 14px;
+    color: #000000;
+    padding: 8px 12px;
+}
+
+.column {
+    border: 1px solid #000;
+}
 </style>

src/views/Warehousing/outStock/AddOrUpdate.vue

@@ -3535,8 +3535,8 @@ print_fyqr = false;
         <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column label="行号" type="index" width="80">
         </el-table-column>
-        <el-table-column prop="fCorpname" header-align="center" align="center" label="客户名称" />
-        <el-table-column prop="fName" header-align="center" align="center" label="费用名称" />
+        <el-table-column prop="fCorpname" header-align="center" align="center" show-overflow-tooltip label="客户名称" />
+        <el-table-column prop="fName" header-align="center" align="center" show-overflow-tooltip label="费用名称" />
         <el-table-column prop="fFeeUnitid" header-align="center" align="center" width="180px" label="计价单位">
           <template slot-scope="scope">
             <el-select v-model="scope.row.fFeeUnitid" placeholder="请选择计价单位" @change="changeFeeUnit(scope.row)" disabled
@@ -3547,7 +3547,7 @@ print_fyqr = false;
           </template>
         </el-table-column>
         <el-table-column prop="fPrice" header-align="center" align="center" label="单价" width="100px" />
-        <el-table-column prop="remark" header-align="center" align="center" label="备注" />
+        <el-table-column prop="remark" header-align="center" align="center" show-overflow-tooltip label="备注" />
       </el-table>
 
       <pagination v-show="whgenlegTotal > 0" :total="whgenlegTotal" :page.sync="pageNum" :limit.sync="pageSize"

vue.config.js

@@ -58,10 +58,10 @@ module.exports = {
         // target: `https://hwc.tubaosoft.com/prod-api/`,
         // target: `https://zjxd.dhscs.net/prod-api/`,
         // target: `http://ck.huodaonar.com/prod-api/`,
-        // target: `https://ck.hturing.com/prod-api/`,
+        target: `https://ck.hturing.com/prod-api/`,
         // target: `https://hltd.echepei.com/prod-api/`,
         // target: `https://jingang.re-king.cn//prod-api/`,
-        target: `https://wms.hadexpress.com/prod-api/`,
+        // target: `https://wms.hadexpress.com/prod-api/`,
         // target: `https://jingrun.tubaosoft.com/prod-api/`,
         // target: `https://www.jingruntech.com/prod-api/`,
         // target: `https://ke.khzclogistics.com/prod-api/`,