Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

.env.production

@@ -4,7 +4,7 @@
 
 NODE_ENV = 'production'
 # base api
-VUE_APP_BASE_API = 'http://api.zthymaoyi.com/'
+VUE_APP_BASE_API = 'http://47.100.3.209/pb'
 
 # 微服务相关接口配置
 ## 任务消息

src/views/tranManagement/tranManagementShippingArrangemen.vue

@@ -164,7 +164,7 @@
                   @click="del(index)"
                   src="../../../public/img/del.png"
                   alt
-                >x</span>
+                >×</span>
               </ws-info-table>
             </div>
             <div>
@@ -175,7 +175,7 @@
                 @click="add"
                 v-show="item.shipType=='散船'"
               >
-                <img width="22" height="22" @click="add" src="../../../public/img/add.png" alt />
+                <img width="22" height="22" src="../../../public/img/add.png" alt />
                 <div class="spans">添加仓位</div>
               </el-button>
             </div>
@@ -349,28 +349,17 @@ export default {
         .toPromise()
         .then(response => {
           this.deptBudgetList = response
-          // for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-          //   var num = this.deptBudgetList.tranCarInfoList[
-          //     i
-          //   ].positionWeight.split(',')
-          //   for (var j = 0; j < num.length; j++) {
-          //     var num2 = num[j].split('/')
-          //     this.freightspace.push({
-          //       impurity: num2[i],
-          //       positionWeight: num2[num2.length - 1]
-          //     })
-          //   }
-          // }
           if(response.tranCarInfoList.length>0) {
-            if(response.tranCarInfoList[i].positionWeight) {
-              this.list = response.tranCarInfoList[0].positionWeight.splice(',')
-              for(var i = 0;i<this.list.length;i++) {
-                var num = this.list[i]
-                this.freightspace.push({
-                  trandriver:num,
-                })
-              }
+            for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
+              var num = this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
+            for (var j = 0; j < num.length; j++) {
+              var num2 = num[j].split('/')
+              this.freightspace.push({
+                impurity: num2[i],
+                positionWeight: num2[num2.length - 1]
+              })
             }
+          }
           }else{
             this.deptBudgetList.tranCarInfoList = [
               {
@@ -383,6 +372,8 @@ export default {
                 shipType:'',
                 boxNumber:'',
                 positionWeight:'',
+                impurity:'',
+                tranType:'3'
 
 
               }
@@ -411,7 +402,7 @@ export default {
     },
     returnsales() {
       this.deptBudgetList = {}
-      this.freightspace = {}
+      this.freightspace =[]
       this.selectedOptions = ''
       this.$router.push({ path: 'tranManagementShipping' })
     },
@@ -460,6 +451,7 @@ export default {
           })
           return
         }
+         if(this.deptBudgetList.tranCarInfoList[i].shipType == '集装箱'){
         if (!this.deptBudgetList.tranCarInfoList[i].boxNumber) {
           this.$message({
             message: '数量不能为空',
@@ -467,6 +459,7 @@ export default {
           })
           return
         }
+        }
         if (!this.deptBudgetList.tranCarInfoList[i].shipType) {
           this.$message({
             message: '类型不能为空',
@@ -474,24 +467,31 @@ export default {
           })
           return
         }
-        if (!this.deptBudgetList.tranCarInfoList[i].impurity) {
+// console.log(this.freightspace,"仓位号")
+        for(var i = 0 ; i < this.freightspace.length ; i++){
+          if (!this.freightspace[i].impurity) {
           this.$message({
             message: '仓位号不能为空',
             type: 'warning'
           })
+          return
         }
-        if (!this.deptBudgetList.tranCarInfoList[i].positionWeight) {
+        if (!this.freightspace[i].positionWeight) {
           this.$message({
             message: '重量不能为空',
             type: 'warning'
           })
+          return
+        }
+
         }
+        
         if (
           new Date(
-            this.deptBudgetList.tranCarInfoList[i].sendDateStart
+            this.deptBudgetList.tranCarInfoList[0].sendDateStart
           ).getTime() >
           new Date(
-            this.deptBudgetList.tranCarInfoList[i].receiveDateEnd
+            this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
           ).getTime()
         ) {
           this.$message({
@@ -518,7 +518,7 @@ export default {
               }
 
               this.deptBudgetList.totalStorage = this.totalStorage
-              this.tranCarInfoList.driver = this.deptBudgetList.tranCarInfoList[0].trandriver
+              this.tranCarInfoList.driver = this.deptBudgetList.tranCarInfoList[0].driver
               this.tranCarInfoList.driverPhone = this.deptBudgetList.tranCarInfoList[0].driverPhone
               this.tranCarInfoList.sendDateStart = this.deptBudgetList.tranCarInfoList[0].sendDateStart
               this.tranCarInfoList.receiveDateEnd = this.deptBudgetList.tranCarInfoList[0].receiveDateEnd
@@ -595,7 +595,7 @@ export default {
 }
 .center {
   width: 90%;
-  margin: 0 auto;
+  // margin: 0 auto;
 }
 
 //表格文字
@@ -802,7 +802,7 @@ export default {
   margin-top: -57px;
 }
 .biao4{
-  margin-left: 1033px;
+  margin-left: 1016px;
   margin-top: -57px;
 }
 .biao5{
@@ -967,7 +967,7 @@ export default {
 }
 .center {
   width: 86%;
-  margin: 0 auto;
+  // margin: 0 auto;
   // margin: 0 -29%;
 }
 .el-form-item {

src/views/tranManagement/tranManagementShippingLook.vue

@@ -6,12 +6,7 @@
         <h2 class="bg-left title">船运调度详情</h2>
       </el-col>
       <el-col :span="4" class="bg-right">
-        <el-button
-          class="bg-bottom"
-          type="primary"
-          size="small"
-          @click="revert()"
-        >
+        <el-button class="bg-bottom" type="primary" size="small" @click="revert()">
           <img
             width="6"
             height="10"
@@ -28,22 +23,16 @@
           <div class="small-title">任务详情</div>
           <ws-info-table>
             <!-- 任务编号 -->
-            <ws-form-item label="任务编号" span="1" prop="processNo">
-              {{ deptBudgetList.processNo }}
-            </ws-form-item>
+            <ws-form-item label="任务编号" span="1" prop="processNo">{{ deptBudgetList.processNo }}</ws-form-item>
             <!-- 货名 -->
-            <ws-form-item label="货名" span="1" prop="goodsName">
-              {{ deptBudgetList.goodsName }}
-            </ws-form-item>
+            <ws-form-item label="货名" span="1" prop="goodsName">{{ deptBudgetList.goodsName }}</ws-form-item>
             <!--重量（吨）-->
             <ws-form-item
               label="重量（吨）"
               span="1"
               prop="weight"
               class="readonly"
-            >
-              {{ deptBudgetList.weight }}
-            </ws-form-item>
+            >{{ deptBudgetList.weight }}</ws-form-item>
 
             <!--发货地址-->
             <ws-form-item label="发货地址" span="1">
@@ -51,59 +40,51 @@
               }}{{ deptBudgetList.sendArea }}
             </ws-form-item>
             <!--发货人-->
-            <ws-form-item label="发货人" span="1" prop="sender">
-              {{ deptBudgetList.sender }}
-            </ws-form-item>
+            <ws-form-item label="发货人" span="1" prop="sender">{{ deptBudgetList.sender }}</ws-form-item>
 
             <!--发货人电话-->
-            <ws-form-item label="发货人电话" span="1" prop="senderPhone">
-              {{ deptBudgetList.senderPhone }}
-            </ws-form-item>
+            <ws-form-item label="发货人电话" span="1" prop="senderPhone">{{ deptBudgetList.senderPhone }}</ws-form-item>
             <!--收货地址-->
-            <ws-form-item
-              label="收货地址"
-              span="1"
-              prop="receiveDetailedAddress"
-            >
+            <ws-form-item label="收货地址" span="1" prop="receiveDetailedAddress">
               {{ deptBudgetList.receivePrivate }}{{ deptBudgetList.receiveCity
               }}{{ deptBudgetList.receiveArea }}
             </ws-form-item>
             <!--收货人-->
-            <ws-form-item label="收货人" span="1" prop="receiver">
-              {{ deptBudgetList.receiver }}
-            </ws-form-item>
+            <ws-form-item label="收货人" span="1" prop="receiver">{{ deptBudgetList.receiver }}</ws-form-item>
 
             <!--收货人电话-->
-            <ws-form-item label="收货人电话" span="1" prop="receiverPhone">
-              {{ deptBudgetList.receiverPhone }}
-            </ws-form-item>
+            <ws-form-item
+              label="收货人电话"
+              span="1"
+              prop="receiverPhone"
+            >{{ deptBudgetList.receiverPhone }}</ws-form-item>
 
             <!--发船日期-->
-            <ws-form-item label="发船日期" span="1" prop="deliveryDateStart">
-              {{ deptBudgetList.deliveryDateStart }}
-            </ws-form-item>
+            <ws-form-item
+              label="发船日期"
+              span="1"
+              prop="deliveryDateStart"
+            >{{ deptBudgetList.deliveryDateStart }}</ws-form-item>
 
             <!--最晚发货日期-->
-            <ws-form-item label="最晚到货日期" span="1" prop="deliveryDateEnd">
-              {{ deptBudgetList.deliveryDateEnd }}
-            </ws-form-item>
+            <ws-form-item
+              label="最晚到货日期"
+              span="1"
+              prop="deliveryDateEnd"
+            >{{ deptBudgetList.deliveryDateEnd }}</ws-form-item>
             <!--合同编号-->
-            <ws-form-item label="合同编号" span="1" prop="contractNo">
-              {{ deptBudgetList.contractNo }}
-            </ws-form-item>
+            <ws-form-item label="合同编号" span="1" prop="contractNo">{{ deptBudgetList.contractNo }}</ws-form-item>
           </ws-info-table>
           <div class="small-title">联络员及航次</div>
           <div
             style="width: 100% "
-           class="flex position middle"
+            class="flex position middle"
             v-for="(item, index) in deptBudgetList.tranCarInfoList"
           >
-        <div style="margin: 18px;color: #69708C;">航次信息</div>
+            <div style="margin: 18px;color: #69708C;">航次信息</div>
             <ws-info-table>
               <!-- 姓名 -->
-              <ws-form-item label="姓名:" span="1" prop="driver" class="siji">
-               {{item.driver}}
-              </ws-form-item>
+              <ws-form-item label="姓名:" span="1" prop="driver" class="siji">{{item.driver}}</ws-form-item>
               <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 电话 -->
               <ws-form-item
@@ -111,9 +92,7 @@
                 span="1"
                 prop="driverPhone"
                 class="siji"
-              >
-                {{ item.driverPhone }}
-              </ws-form-item>
+              >{{ item.driverPhone }}</ws-form-item>
               <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!--发船日期-->
               <ws-form-item
@@ -121,56 +100,58 @@
                 span="1"
                 prop="sendDateStart"
                 class="siji"
-              >
-                {{ item.sendDateStart }}
-              </ws-form-item>
+              >{{ item.sendDateStart }}</ws-form-item>
               <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <ws-form-item
                 label="预计到港日期:"
                 span="1"
                 prop="receiveDateEnd"
                 class="siji"
-              >
-                {{ item.receiveDateEnd }}
-              </ws-form-item>
+              >{{ item.receiveDateEnd }}</ws-form-item>
               <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 船名 -->
-              <ws-form-item label="船名:" span="1" prop="shipName" class="siji">
-                {{ item.shipName }}
-              </ws-form-item>
-            <!-- <el-divider direction="vertical" class="line"></el-divider> -->
+              <ws-form-item label="船名:" span="1" prop="shipName" class="siji">{{ item.shipName }}</ws-form-item>
+              <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 航次 -->
-              <ws-form-item label="航次:" span="1" prop="shipNo" class="siji">
-                {{ item.shipNo }}
-              </ws-form-item>
+              <ws-form-item label="航次:" span="1" prop="shipNo" class="siji">{{ item.shipNo }}</ws-form-item>
 
               <!-- <el-divider direction="vertical" class="line"></el-divider> -->
               <!-- 类型 -->
-              <ws-form-item label="类型:" span="1" prop="shipType" class="siji">
-                {{ item.shipType }}
-              </ws-form-item>
+              <ws-form-item label="类型:" span="1" prop="shipType" class="siji">{{ item.shipType }}</ws-form-item>
               <ws-form-item
                 label="数量"
                 span="1"
                 prop="boxNumber"
                 class="siji"
                 v-show="item.shipType == '集装箱'"
-              >
-                {{ item.boxNumber }}
-              </ws-form-item>
-               
+              >{{ item.boxNumber }}</ws-form-item>
             </ws-info-table>
-            
           </div>
-          
-          <div style="text-align: right; padding: 10px">
-            <el-button
-              class="bg-bottom-up"
-              type="primary"
-              size="small"
-              @click="returnsales()"
-              >关闭</el-button
+          <div class="xia">
+            <div
+              style="width: 100%"
+              class="flex position cangno"
+              v-for="(items, index) in freightspace"
             >
+              <ws-info-table>
+                <ws-form-item
+                  :label="'仓位号-' + (index + 1)"
+                  span="1"
+                  prop="impurity"
+                  class="bot"
+                >{{ items.impurity }}</ws-form-item>
+                <!-- 重量（吨） -->
+                <ws-form-item
+                  label="重量(吨)"
+                  span="1"
+                  prop="positionWeight"
+                  class="bot"
+                >{{ items.positionWeight }}</ws-form-item>
+              </ws-info-table>
+            </div>
+          </div>
+          <div style="text-align: right; padding: 10px">
+            <el-button class="bg-bottom-up" type="primary" size="small" @click="returnsales()">关闭</el-button>
           </div>
         </div>
       </ws-form>
@@ -187,7 +168,7 @@ export default {
   name: 'viewSpareMoney',
   components: {
     WsUpload,
-    Pagination,
+    Pagination
   },
   watch: {
     // vesselId(val) {
@@ -195,7 +176,7 @@ export default {
     // },
     isShow(val) {
       this.showType = val
-    },
+    }
   },
   data() {
     return {
@@ -237,9 +218,9 @@ export default {
             required: true,
             type: 'number',
             message: '请输入活动名称',
-            trigger: 'blur',
-          },
-        ],
+            trigger: 'blur'
+          }
+        ]
       },
       size: 10,
       compId: sessionStorage.getItem('ws-pf_compId'),
@@ -247,21 +228,21 @@ export default {
       packtypeList: {},
       date: {
         year: dayjs().format('YYYY'),
-        month: dayjs().format('MM'),
+        month: dayjs().format('MM')
       },
       contractList: [],
       deptBudgetList: {
         warehouseInOutDetail: {},
-        tranCarInfoList: [],
+        tranCarInfoList: []
       },
       historyList: [],
 
       pickerBeginDateBefore: {
-        disabledDate: (time) => {
+        disabledDate: time => {
           return time.getTime() > Date.now()
-        },
+        }
       },
-      accessoryTFs: false,
+      accessoryTFs: false
     }
   },
   mounted() {
@@ -278,16 +259,17 @@ export default {
     loaddata() {
       shippingLook({ id: this.$route.query.id })
         .toPromise()
-        .then((response) => {
+        .then(response => {
           this.deptBudgetList = response
           for (var i = 0; i < this.deptBudgetList.tranCarInfoList.length; i++) {
-            var num =
-              this.deptBudgetList.tranCarInfoList[i].positionWeight.split(',')
+            var num = this.deptBudgetList.tranCarInfoList[
+              i
+            ].positionWeight.split(',')
             for (var j = 0; j < num.length; j++) {
               var num2 = num[j].split('/')
               this.freightspace.push({
                 impurity: num2[i],
-                positionWeight: num2[num2.length - 1],
+                positionWeight: num2[num2.length - 1]
               })
             }
           }
@@ -320,7 +302,7 @@ export default {
       this.freightspace.push({
         binNumber: '',
         maxStorage: '',
-        remark: '',
+        remark: ''
       })
     },
     //提交按钮
@@ -328,18 +310,19 @@ export default {
       this.$confirm(`暂存后可在待完成页面查看，确定暂存`, {
         cancelButtonText: '取消',
         confirmButtonText: '确定',
-        type: 'warning',
+        type: 'warning'
       })
         .then(() => {
-          this.$refs.deptBudgetList.validate((valid) => {
+          this.$refs.deptBudgetList.validate(valid => {
             if (valid) {
-              this.deptBudgetList.compId =
-                sessionStorage.getItem('ws-pf_compId')
+              this.deptBudgetList.compId = sessionStorage.getItem(
+                'ws-pf_compId'
+              )
               this.deptBudgetList.inOutFlag = 2
               this.deptBudgetList.statusFlag = 1
               addstorageputList(this.deptBudgetList)
                 .toPromise()
-                .then((response) => {
+                .then(response => {
                   this.$message.success('暂存成功')
                   this.$router.push({ path: 'warehouseManagementList' })
                 })
@@ -354,7 +337,7 @@ export default {
         })
     },
     returnsales() {
-     this.$router.go(-1)
+      this.$router.go(-1)
     },
     handleClose() {
       this.accessoryTFs = false
@@ -377,8 +360,8 @@ export default {
       }
     },
     approve() {},
-    listQuery() {},
-  },
+    listQuery() {}
+  }
 }
 </script>
 <style lang="scss" scoped>
@@ -426,7 +409,7 @@ export default {
   padding: 16px 20px;
 }
 .center {
-  width: 106%;
+  width: 100%;
   margin: 0 auto;
 }
 
@@ -517,7 +500,7 @@ export default {
 }
 /deep/.flex .ws-info-table .el-form-item .el-form-item__content {
   border: 0px;
-  border-right: 1px solid #D8DCE6;
+  border-right: 1px solid #d8dce6;
   border-radius: 0px;
 }
 /deep/.ws-class-table-col {
@@ -571,29 +554,32 @@ export default {
   background-color: #f5f7fa;
   // text-align: center;
   width: 48%;
-  
 }
 .middle {
   background: #f6f7fc;
   border-radius: 4px;
   border: 1px solid #d8dce6;
 }
-.line{
+.line {
   height: 26px;
   margin-top: 6px;
   left: 2px;
 }
-/deep/.ws-info-table[data-v-850a44a6] .el-form-item .el-form-item__label {
-    // background-color: #eee;
-    // padding-right: 8px;
-    // padding-left: 8px;
-    // width: 100px;
-    font-size: 12px;
-    font-weight: bold;
-    // color: #333;
-    // overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    // line-height: 40px;
+/deep/.ws-info-table.el-form-item .el-form-item__label {
+  // background-color: #eee;
+  // padding-right: 8px;
+  // padding-left: 8px;
+  // width: 100px; 
+  font-size: 12px;
+  // font-weight: bold;
+  // color: #333;
+  // overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  // line-height: 40px;
+  text-align: center;
+}
+/deep/.cangno .ws-info-table .el-form-item .el-form-item__content {
+  border: none;
 }
 </style>

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.121:8090/',
+        target: 'http://192.168.1.116:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',