Browse Source

格式化日期

caojunjie 3 years ago
parent
commit
5366481df5

+ 6 - 6
src/views/login.vue

@@ -52,17 +52,17 @@
     </el-form>
     </el-form>
     <!--  底部  -->
     <!--  底部  -->
     <!--青岛途宝软件开发有限公司-->
     <!--青岛途宝软件开发有限公司-->
-<!--    <div class="el-login-footer">-->
-<!--      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛途宝软件开发有限公司</span>-->
-<!--    </div>-->
+    <div class="el-login-footer">
+      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=37021302000853">鲁公网安备 37021302000853号</a> <a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛途宝软件开发有限公司</span>
+    </div>
     <!--青岛靖润科技物流有限公司-->
     <!--青岛靖润科技物流有限公司-->
 <!--    <div class="el-login-footer">-->
 <!--    <div class="el-login-footer">-->
 <!--      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021033363号-1</a>  青岛靖润科技物流有限公司</span>-->
 <!--      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021033363号-1</a>  青岛靖润科技物流有限公司</span>-->
 <!--    </div>-->
 <!--    </div>-->
 <!--    凯和-->
 <!--    凯和-->
-    <div class="el-login-footer">
-      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛凯和志诚物流有限公司</span>
-    </div>
+<!--    <div class="el-login-footer">-->
+<!--      <img src="./icp.png" alt="" height="14px" style="margin-right:2px"> <span><a href="https://beian.miit.gov.cn/">鲁ICP备2021017300号-1</a>  青岛凯和志诚物流有限公司</span>-->
+<!--    </div>-->
   </div>
   </div>
 </template>
 </template>
 
 

+ 8 - 7
src/views/warehouse/Shipping/AddOrUpdate.vue

@@ -804,6 +804,7 @@ export default {
     //   this.podList = response.data;
     //   this.podList = response.data;
     // });
     // });
     listRoute({}).then(response => {
     listRoute({}).then(response => {
+      response.rows.forEach(item=>item.fId = JSON.stringify(item.fId))
       this.podList = response.rows
       this.podList = response.rows
     });
     });
     this.queryUser();
     this.queryUser();
@@ -1066,37 +1067,37 @@ export default {
                     "海运费第" + (Number(item) + 1) + "行费用不能为空"
                     "海运费第" + (Number(item) + 1) + "行费用不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fSpecification1) {
+                if (this.detailList[item].fSpecification1.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行20GP不能为空"
                     "海运费第" + (Number(item) + 1) + "行20GP不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fSpecification2) {
+                if (this.detailList[item].fSpecification2.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行40GP不能为空"
                     "海运费第" + (Number(item) + 1) + "行40GP不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fSpecification3) {
+                if (this.detailList[item].fSpecification3.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行40HC不能为空"
                     "海运费第" + (Number(item) + 1) + "行40HC不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fSpecification4) {
+                if (this.detailList[item].fSpecification4.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行45HC不能为空"
                     "海运费第" + (Number(item) + 1) + "行45HC不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fSpecification5) {
+                if (this.detailList[item].fSpecification5.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行20RH不能为空"
                     "海运费第" + (Number(item) + 1) + "行20RH不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fSpecification6) {
+                if (this.detailList[item].fSpecification6.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行40RH不能为空"
                     "海运费第" + (Number(item) + 1) + "行40RH不能为空"
                   );
                   );
                 }
                 }
-                if (!this.detailList[item].fExrate) {
+                if (this.detailList[item].fExrate.length < 1) {
                   return this.$message.error(
                   return this.$message.error(
                     "海运费第" + (Number(item) + 1) + "行汇率不能为空"
                     "海运费第" + (Number(item) + 1) + "行汇率不能为空"
                   );
                   );

+ 4 - 1
src/views/warehouse/Shipping/index.vue

@@ -366,6 +366,9 @@
                 </div></el-link
                 </div></el-link
               >
               >
             </span>
             </span>
+            <span v-else-if="item.label == 'fValiddate'">
+              {{ scope.row.fValiddate.slice(0,10) }}
+            </span>
             <span v-else>{{ scope.row[item.label] }}</span>
             <span v-else>{{ scope.row[item.label] }}</span>
           </template>
           </template>
         </el-table-column>
         </el-table-column>
@@ -482,7 +485,7 @@ export default {
       tableDate: [
       tableDate: [
         {
         {
           surface: "1",
           surface: "1",
-          label: "fCorpid",
+          label: "fCorpName",
           name: "船公司",
           name: "船公司",
           checked: 0,
           checked: 0,
           width: 100,
           width: 100,