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

src/api/ecw/productPrice.js

@@ -97,3 +97,13 @@ export function getPriceSnapshotList(priceId){
     params: {priceId}
   })
 }
+
+
+// 获得路线产品
+export function getProductPriceGetPrice(query) {
+  return request({
+    url: '/ecw/product-price/getPrice',
+    method: 'get',
+    params: query
+  })
+}
\ No newline at end of file

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -145,7 +145,7 @@
           </el-table-column>
           <el-table-column :label="$t('重量')" align="center">
             <template slot-scope="scope">
-              <span>{{scope.row.weight}}m³</span>
+              <span>{{scope.row.weight}}kg</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('箱数')" align="center">

src/views/ecw/box/shippingSea/seaProcess.vue

@@ -238,9 +238,9 @@ export default {
             node.currStatus = "end";
             // 判断是否存在异常未处理
             if (
-              val.customsHasAbnormal ||
-              val.shippingHasAbnormal ||
-              val.arrivalHasAbnormal
+              (type === "cusDeclaration" && val.customsHasAbnormal) ||
+              (type === "departure" && val.shippingHasAbnormal) ||
+              (type === "arrival" && val.arrivalHasAbnormal)
             ) {
               continue;
             }

src/views/ecw/deptTarget/index.vue

@@ -4,18 +4,18 @@
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item :label="$t('部门')" prop="deptId">
-        <el-select v-model="queryParams.deptId" style="width: 300px;" :placeholder="$t('请选择部门')">
+        <el-select v-model="queryParams.deptId" style="width: 300px;" :placeholder="$t('请选择部门')" clearable>
           <el-option v-for="item in this.deptData" :key="item.id" :label="item.name" :value="item.id"/>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('目标类型')" prop="targetType">
-        <dict-selector :type="DICT_TYPE.TARGET_TYPE" v-model="queryParams.targetType" formatter="number"/>
+      <el-form-item :label="$t('目标类型')" prop="targetType" >
+        <dict-selector :type="DICT_TYPE.TARGET_TYPE" v-model="queryParams.targetType" formatter="number" clearable/>
       </el-form-item>
       <el-form-item :label="$t('运输方式')" prop="transportType">
-        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number"/>
+        <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="queryParams.transportType" formatter="number" clearable/>
       </el-form-item>
       <el-form-item :label="$t('出货渠道')" prop="shippingChannel">
-        <el-select v-model="queryParams.shippingChannel" :placeholder="$t('请选择出货渠道')">
+        <el-select v-model="queryParams.shippingChannel" :placeholder="$t('请选择出货渠道')" clearable>
           <el-option v-for="item in channelList" :label="item.nameZh" :value="item.channelId"
                      :key="item.channelId"></el-option>
         </el-select>
@@ -148,7 +148,7 @@
         getCreateInitData,
         getPersonTargetPage
     } from "@/api/ecw/deptTarget";
-    import {listSimpleDepts} from "@/api/system/dept";
+    import {listDept, listSimpleDepts} from "@/api/system/dept";
     import {getChannelList} from '@/api/ecw/channel';
     import dayjs from "dayjs";
 import { parseTime } from '@/utils/ruoyi';
@@ -237,24 +237,27 @@ import { parseTime } from '@/utils/ruoyi';
             }
         },
         created() {
-            listSimpleDepts().then(res => {
-                res.data.forEach((item) => {
-                    if (item.parentId == 0) {
-
-                        this.deptArr.push(item)
-
-                    } else {
-                        this.deptData.push(item)
-                    }
-                })
-                this.deptData.forEach((value) => {
-                    var dept = this.deptArr.filter(itt => itt.id == value.parentId)
-                    if (dept.length > 0) {
-                        value.name = dept[0].name + ' | ' + value.name
-                    }
+          this.getDeptList();
 
-                })
-            });
+            // listSimpleDepts().then(res => {
+            //   this.deptList = this.handleTree(res, "id");
+            //   console.log("this.deptList:"+JSON.stringify(this.deptList));
+            //     res.data.forEach((item) => {
+            //         if (item.parentId == 0) {
+            //             this.deptArr.push(item)
+            //         }
+            //         else {
+            //             this.deptData.push(item)
+            //         }
+            //     })
+            //     this.deptData.forEach((value) => {
+            //         var dept = this.deptArr.filter(itt => itt.id == value.parentId)
+            //         if (dept.length > 0) {
+            //             value.name = dept[0].name + ' | ' + value.name
+            //         }
+            //
+            //     })
+            // });
             getCreateInitData().then(res => {
                 this.monthList = res.data.month;
                 this.quarterList = res.data.quarter;
@@ -264,6 +267,36 @@ import { parseTime } from '@/utils/ruoyi';
             this.getList();
         },
         methods: {
+          /** 查询部门列表 */
+          getDeptList(){
+            this.loading = true;
+            listDept(this.queryParams).then(response => {
+              this.deptList = this.handleTree(response.data, "id");
+              console.log("this.deptList:"+JSON.stringify(this.deptList));
+              this.deptList.forEach((item) => {
+                this.normalizer(item);
+                // this.deptData.push(item);
+                // if(item.children!=null&&item.children.length>0){
+                //   item.children.forEach((c) => {
+                //     c.name = item.name +"|"+ c.name;
+                //     this.deptData.push(c);
+                //   });
+                // }
+              });
+              // this.loading = false;
+            });
+          },
+          normalizer(item) {
+            this.deptData.push(item);
+            if(item.children!=null&&item.children.length>0){
+              item.children.forEach((c) => {
+                c.name = item.name +"|"+ c.name;
+                this.normalizer(c);
+                // this.deptData.push(c);
+              });
+            }
+            return item;
+          },
             getChannelList() {
                 getChannelList().then(res => this.channelList = res.data)
             },

src/views/ecw/order/pending.vue

@@ -123,6 +123,7 @@ import { getCurrencyList } from '@/api/ecw/currency'
 import {getOrder} from '@/api/ecw/order'
 import FilePreview from '@/components/FilePreview'
 import {getProduct} from '@/api/ecw/product'
+import {getProductPriceGetPrice} from '@/api/ecw/productPrice'
 
 export default {
   name: "Pending",
@@ -193,6 +194,7 @@ export default {
     handEdit(row){
       // 未报价异常
       if(row.orderExceptionType=='order_no_quote_exception'){
+
         if(row.orderItemId){
           var productData = this.orderData.orderItemVOList.find(item=>item.orderItemId==row.orderItemId)
           if(productData){
@@ -208,12 +210,25 @@ export default {
                   lineId: this.orderData.logisticsInfoDto.lineId,
                   channelId: this.orderData.logisticsInfoDto.channelId
                 }
+                let queryParams = {
+                  productId: productData.prodId,
+                  lineId: this.orderData.logisticsInfoDto.lineId,
+                  channelId: this.orderData.logisticsInfoDto.channelId
+                }
                 let url = '../../lineProject/product-price/edit?' + (new URLSearchParams(params)).toString()
+                getProductPriceGetPrice(queryParams).then(res=>{
+                  console.log(res)
+                  if(res.data){
+                    url =  '../../lineProject/product-price/edit?action=update&id='+res.data.id
+                  }
+                  return this.$router.push(url)
+                })
+
                 /* +productData.prodId
                 +'&product_type='+res.data.typeId
                 +'&transportId='+this.orderData.transportId
                 +'&exportCity='+this.orderData.logisticsInfoDto.startCityId+'&importCity='+this.orderData.logisticsInfoDto.destCityId */
-                return this.$router.push(url)
+
             })
           }
         }else{