Merge branch 'master' of git.echepei.com:zhujiawei/Warehouse_management_ui

src/views/analysis/stockDetail/index.vue

@@ -118,28 +118,25 @@ export default {
         case "出库": {
           this.$router.push({
             path: "/business/outStock",
-            query: { data: JSON.stringify(row) },
+            query: { id: row.fId },
           });
           break;
         }
         case "调拨": {
           this.$router.push({
-            path: "/business/goodsTransfer",
-            query: { data: JSON.stringify(row) },
+            path: "/business/stockTransfer",
           });
           break;
         }
         case "货权转移": {
           this.$router.push({
             path: "/business/stockTransfer",
-            query: { data: { billId: row.fId } },
           });
           break;
         }
         case "货物通关": {
           this.$router.push({
             path: "/business/cargoClearance",
-            query: { data: JSON.stringify(row) },
           });
           break;
         }

src/views/basicdata/fleet/companyMsg-add-or-update.vue

@@ -395,7 +395,7 @@ export default {
         fTel: [
           { required: true, message: "请输入联系人电话", trigger: "blur" },
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },

src/views/basicdata/fleet/driverMsg-add-or-update.vue

@@ -306,7 +306,7 @@ export default {
         fTel: [
           { required: true, message: "请输入联系电话", trigger: "blur" },
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },

src/views/finance/contrast/index.vue

@@ -219,6 +219,7 @@
         :prop="item.label"
         align="center"
         :fixed="item.fixed"
+        :show-overflow-tooltip="true"
       />
       <!--      <el-table-column label="系统编号" align="center" prop="fBillno" show-overflow-tooltip width="120"/>-->
       <!--      <el-table-column label="货权方" sortable align="center" show-overflow-tooltip prop="fCtrlcorpid" width="220"/>-->

src/views/fleet/plans/AddOrUpdate.vue

@@ -1414,21 +1414,21 @@ export default {
         ],
         loadAttntel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         mdLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         unLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },

src/views/fleet/plans/index.vue

@@ -317,14 +317,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="提单号"
-        width="100"
+        width="180"
         align="center"
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
       >
         <template slot-scope="scope">
-          <el-link :underline="false"
+          <el-link :underline="false" type="primary"
             ><div @click="handleUpdate(scope.row)">
               {{ scope.row.mblno }}
             </div></el-link

src/views/fleet/scheduling/AddOrUpdate.vue

@@ -1395,21 +1395,21 @@ export default {
         ],
         loadAttntel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         mdLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         unLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },

src/views/fleet/scheduling/index.vue

@@ -300,14 +300,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="提单号"
-        width="100"
+        width="180"
         align="center"
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
       >
         <template slot-scope="scope">
-            <el-link :underline="false"
+            <el-link :underline="false" type="primary"
             ><div @click="handleUpdate(scope.row)">
               {{ scope.row.mblno }}
             </div></el-link

src/views/fleet/sendcar/AddOrUpdate.vue

@@ -1397,21 +1397,21 @@ export default {
         ],
         loadAttntel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         mdLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         unLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },

src/views/fleet/sendcar/index.vue

@@ -310,14 +310,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="提单号"
-        width="100"
+        width="180"
         align="center"
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
       >
         <template slot-scope="scope">
-            <el-link :underline="false"
+            <el-link :underline="false" type="primary"
             ><div @click="handleUpdate(scope.row)">
               {{ scope.row.mblno }}
             </div></el-link

src/views/track/cabinet/AddOrUpdate.vue

@@ -1225,21 +1225,21 @@ export default {
         // // ],
         // loadAttntel: [
         //   {
-        //     pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+        //     pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
         //     message: "请正确输入手机号",
         //     trigger: "blur",
         //   },
         // ],
         // mdLoadAttnTel: [
         //   {
-        //     pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+        //     pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
         //     message: "请正确输入手机号",
         //     trigger: "blur",
         //   },
         // ],
         // unLoadAttnTel: [
         //   {
-        //     pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+        //     pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
         //     message: "请正确输入手机号",
         //     trigger: "blur",
         //   },

src/views/track/cabinet/index.vue

@@ -384,14 +384,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="提单号"
-        width="100"
+        width="180"
         align="center"
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
       >
         <template slot-scope="scope">
-            <el-link :underline="false"
+            <el-link :underline="false" type="primary"
             ><div @click="handleUpdate(scope.row)">
               {{ scope.row.mblno }}
             </div></el-link

src/views/track/singleCost/AddOrUpdate.vue

@@ -736,21 +736,21 @@ export default {
         ],
         loadAttntel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         mdLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },
         ],
         unLoadAttnTel: [
           {
-            pattern: /^((0\d{2,3}-\d{7,8})|(1[3584]\d{9}))$/,
+            pattern: /^((0\d{2,3}-\d{7,8})|(1[0123456789]\d{9}))$/,
             message: "请正确输入手机号",
             trigger: "blur",
           },

src/views/track/singleCost/index.vue

@@ -310,14 +310,14 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column
         label="提单号"
-        width="100"
+        width="180"
         align="center"
         :show-overflow-tooltip="true"
         sortable
         fixed="left"
       >
         <template slot-scope="scope">
-            <el-link :underline="false"
+            <el-link :underline="false" type="primary"
             ><div @click="handleUpdate(scope.row)">
               {{ scope.row.mblno }}
             </div></el-link

src/views/warehouseBusiness/stockTransfer/index.vue

@@ -2442,7 +2442,7 @@
             >
               作业类型：{{businessType}}
             </td>
-            <td  width="500"v-if="this.printinglist.length === 0 || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：111</td>
+            <td  width="500" v-if="this.printinglist.length === 0 || !fBstime" colspan="2" style="padding-bottom: 0; font-weight: bold;">入库时间：111</td>
 
             <td
               v-else
@@ -5950,7 +5950,7 @@ export default {
   height: 50px;
   text-align: center;
   border-right: 1px solid #dfe6ec !important;
-  order-bottom: 1px solid #dfe6ec !important;
+  border-bottom: 1px solid #dfe6ec !important;
   border-bottom: 1px solid #dfe6ec !important;
 }
 .el-table thead th {