Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/index.vue

@@ -195,13 +195,13 @@
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
-          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
+          :is="row.orderType > 1 ? 'el-tooltip' : 'div'"
           class="item"
           :style="{
-            color: row.orderType ==  2 ? 'red' : null
+            color: row.orderType > 1 ? 'red' : null
           }"
           effect="dark"
-          :content="(row.wvolume||0)+'m³'"
+          :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
           placement="bottom">
             <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>

src/views/ecw/order/penddingList.vue

@@ -136,14 +136,14 @@
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
-          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
-          class="item"
-          :style="{
-            color: row.orderType ==  2 ? 'red' : null
+            :is="row.orderType > 1 ? 'el-tooltip' : 'div'"
+            class="item"
+            :style="{
+            color: row.orderType > 1 ? 'red' : null
           }"
-          effect="dark"
-          :content="(row.wvolume||0)+'m³'"
-          placement="bottom">
+            effect="dark"
+            :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
+            placement="bottom">
             <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
           </component>

src/views/ecw/order/stockingList.vue

@@ -134,14 +134,14 @@
         <template slot-scope="{row}">
           <!--入仓前是填单数据，入仓后是入仓数据，装柜审核通过等状态inwarehouseState会变成0，所以只能通过sumNum来判断-->
           <component
-          :is="row.orderType ==  2 ? 'el-tooltip' : 'div'"
-          class="item"
-          :style="{
-            color: row.orderType ==  2 ? 'red' : null
+            :is="row.orderType > 1 ? 'el-tooltip' : 'div'"
+            class="item"
+            :style="{
+            color: row.orderType > 1 ? 'red' : null
           }"
-          effect="dark"
-          :content="(row.wvolume||0)+'m³'"
-          placement="bottom">
+            effect="dark"
+            :content="row.orderType===2 ? (row.wvolume||0)+'m³' : (row.vweight || 0) + 'kg'"
+            placement="bottom">
             <div v-if="row.sumNum > 0">{{row.sumVolume}}m³ /{{row.sumWeight}}Kg</div>
             <div v-else>{{row.costVO.totalVolume}}m³ /{{row.costVO.totalWeight}}Kg</div>
           </component>

src/views/ecw/warehouse/index.vue

@@ -333,6 +333,32 @@
               <el-radio :label="1">不支持</el-radio>
             </el-radio-group>
           </el-form-item>
+       <template v-if="['3','4'].includes(lineform.transportType)"  >
+         <el-form-item :label="$t('空运发件人')">
+            <el-input v-model="lineform.senderInfo.name"  style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item :label="$t('空运发件人英文')">
+           <el-input v-model="lineform.senderInfo.nameEn" style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item :label="$t('空运发件公司地址')">
+           <el-input v-model="lineform.senderInfo.companyAddress" style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item :label="$t('空运发件公司地址英文')">
+           <el-input  v-model="lineform.senderInfo.companyAddressEn" style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item :label="$t('空运收货人')">
+           <el-input v-model="lineform.recipientInfo.name" style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item :label="$t('空运收货人英文')">
+           <el-input v-model="lineform.recipientInfo.nameEn" style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item :label="$t('空运收货地址')">
+           <el-input v-model="lineform.recipientInfo.companyAddress" style="width: 400px" ></el-input>
+         </el-form-item>
+         <el-form-item  :label="$t('空运收货地址英文')">
+           <el-input v-model="lineform.recipientInfo.companyAddressEn"  style="width: 400px" ></el-input>
+         </el-form-item>
+       </template>
         </el-form>
 
         <div slot="footer" class="dialog-footer">
@@ -552,7 +578,25 @@ export default {
       // 表单参数
       form: {checkList:[],},
       ladingform: {prefixCounter:null,titleZh:null,contentZh:null,account:null,acctArr:[]},
-      lineform: {otherService:[],isClientShow:1,makeBillNode:'2',controlStatus:'0',currencyUnit:1,minPrice:0},
+      lineform: {
+        otherService:[],
+        isClientShow:1,
+        makeBillNode:'2',
+        controlStatus:'0',
+        currencyUnit:1,
+        minPrice:0,
+        "recipientInfo": {
+          "companyAddress": "",
+          "companyAddressEn": "",
+          "name": "",
+          "nameEn": ""
+        },
+        "senderInfo": {
+          "companyAddress": "",
+          "companyAddressEn": "",
+          "name": "",
+          "nameEn": ""
+        }},
       startName:'',
       destName:'',
 
@@ -892,6 +936,19 @@ export default {
         this.lineform.makeBillNode = row.makeBillNode;
          this.lineform.currencyUnit =  row.currencyUnit ? row.currencyUnit : 1
          this.lineform.controlStatus =  row.controlStatus ?  row.controlStatus  : 0
+      // 先清空 发货人和收货人信息
+      this.lineform.senderInfo = {
+        "companyAddress": "",
+        "companyAddressEn": "",
+        "name": "",
+        "nameEn": ""
+      }
+      this.lineform.recipientInfo =   { "companyAddress": "",
+        "companyAddressEn": "",
+        "name": "",
+        "nameEn": ""}
+        Object.assign(this.lineform.recipientInfo, row.recipientInfo)
+        Object.assign(this.lineform.senderInfo, row.senderInfo)
         this.lineform.minPrice = row.minPrice ?  row.minPrice  : 0
        if(row.minPrice){
          this.lineform.minPrice = row.minPrice;
@@ -922,10 +979,14 @@ export default {
         makeBillNode:this.lineform.makeBillNode,
         controlStatus:this.lineform.controlStatus,
         currencyUnit:this.lineform.currencyUnit,
-        minPrice:this.lineform.minPrice
+        minPrice:this.lineform.minPrice,
+        senderInfo:this.lineform.senderInfo,
+        recipientInfo:this.lineform.recipientInfo
+
         }).then(res => {
           this.$modal.msgSuccess(this.$t("操作成功"));
            this.getRouteList()
+
           for(let index in this.routeList) {
             let routeItem = this.routeList[index];
             if(routeItem.lineId && routeItem.lineId == this.lineform.lineId) {