Merge remote-tracking branch 'origin/dev' into dev

src/views/bpm/processInstance/detail.vue

@@ -259,10 +259,16 @@ export default {
           component: "shippingDetail",
           processId: this.processInstance.businessKey,
         },
+        // 拆单审核
         split_detail: {
           component: "SplitDetail",
           id: this.processInstance.businessKey,
         },
+        // 出货拆单审核
+        shipment_split_detail: {
+          component: "SplitDetail",
+          id: this.processInstance.businessKey,
+        },
         merge_detail: {
           component: "MergeDetail",
           id: this.processInstance.businessKey,

src/views/ecw/offer/components/SpecialDetail.vue

@@ -25,19 +25,19 @@
       </div>
       
       <div>
-        原运费：{{form.seaFreight + currencyMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+        原运费：{{form.seaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        新运费：{{newSeaFreight + currencyMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+        新运费：{{newSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        成本价：{{form.orgSeaFreight + currencyMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+        成本价：{{form.orgSeaFreight}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        明佣：{{ form.lightCommissionAmount + currencyMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+        明佣：{{ form.lightCommissionAmount}}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
       <div>
-        暗佣：{{form.shadeCommissionAmount + currencyMap[form.orgSeaFreightCurrency] + '/' + unitMap[form.orgSeaFreightVolume]}}
+        暗佣：{{form.shadeCommissionAmount }}{{currencyMap[form.seaFreightCurrency]}} / {{unitMap[form.seaFreightVolume]}}
       </div>
     </el-descriptions-item>
 

src/views/ecw/offer/edit.vue

@@ -441,16 +441,16 @@
             </el-form-item>
 
             <el-form-item :label="$t('清关证书')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
-                <dict-selector v-model="form.transportVO.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
+                <dict-selector v-model="form.transportVO.customsClearCert"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" />
             </el-form-item>
             <el-form-item :label="$t('清关证书备注')" v-if="[2,3,4].indexOf(+form.transportId) > -1">
                 <el-input v-model="form.transportVO.remarks" ></el-input>
             </el-form-item>
             <el-form-item :label="$t('是否拆包')" v-if="[3,4].indexOf(+form.transportId) > -1">
-                <dict-selector v-model="form.transportVO.isUnpack"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
+                <dict-selector v-model="form.transportVO.isUnpack"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" />
             </el-form-item>
             <el-form-item :label="$t('单票立刻转运')" v-if="[3,4].indexOf(+form.transportId) > -1">
-                <dict-selector v-model="form.transportVO.isSingleTicketTransport"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" fomatter="bool" />
+                <dict-selector v-model="form.transportVO.isSingleTicketTransport"  form-type="radio" :type="DICT_TYPE.INFRA_BOOLEAN_STRING" formatter="bool" />
                 <span style="margin-left:10px">{{$t('注：若只有一件，货到仓库立即发，选“是”，多件需仓库集运待发，选“否”')}}</span>
             </el-form-item>
             <br/>
@@ -751,7 +751,19 @@ export default {
     'form.objectiveId'(){
         this.getOpenedRouterList()
     },
-    'form.transportId'(){
+    'form.transportId'(transportId){
+
+        // 海空联运默认数据
+        if(transportId == 4){
+            this.$set(this.form.transportVO, Object.assign(this.form.transportVO, {
+                "doubleClear":"1",
+                "customsClearCert":false,
+                "isUnpack":false,
+                "isSingleTicketTransport":false,
+                "packageTypeArr":[],
+                "packageType":""
+            }))
+        }
         this.getOpenedRouterList()
     },
     'form.channelId'(){
@@ -764,7 +776,6 @@ export default {
         this.$set(this.form, 'objectiveId', router.destCityId)
     },
     'form.transportVO.packageTypeArr'(val){
-        console.log('form.transportVO.packageTypeArr', val)
         this.$set(this.form.transportVO, 'packageType', val.join(','))
     },
     // 选择的路线变化后，需要判断是否开通了对应的服务，如果没开通需要取消对应的服务选择
@@ -802,7 +813,6 @@ export default {
             formData.prodCreateReqVOList = []
             if(formData.transportVO && formData.transportVO.packageType){
                 formData.transportVO.packageTypeArr = formData.transportVO.packageType.split(",").filter(item => item && item != '')
-                console.log(formData.transportVO.packageType, formData.transportVO.packageTypeArr)
             }
             if(res.data.offerProdRespVOList){
                 res.data.offerProdRespVOList.forEach(item => {

src/views/ecw/order/components/CancelCargo.vue

@@ -48,7 +48,7 @@
     </el-dialog>
 </template>
 <script>
-import {createPick, getRleaseInfo, seasoningCondimentsSelect, updateApply} from '@/api/ecw/orderCargoControl'
+import {createPick, getReleaseInfo, seasoningCondimentsSelect, updateApply} from '@/api/ecw/orderCargoControl'
 import AreaCodeSelector from '@/components/AreaCodeSelector'
 import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
 import WorkFlow from '@/components/WorkFlow'
@@ -85,7 +85,7 @@ export default {
     },
     methods:{
         loadData(){
-          getRleaseInfo(this.order.orderId).then(res => this.detail = res.data)
+          getReleaseInfo(this.order.orderId).then(res => this.detail = res.data)
         },
         closeDialog(){
             this.show = false

src/views/ecw/order/components/Release.vue

@@ -102,7 +102,7 @@
 </template>
 <script>
 import {getOrder} from '@/api/ecw/order'
-import {createPick, getRleaseInfo} from '@/api/ecw/orderCargoControl'
+import {createPick, getReleaseInfo} from '@/api/ecw/orderCargoControl'
 import AreaCodeSelector from '@/components/AreaCodeSelector'
 import SendSmsCode from '@/views/ecw/order/components/SendSmsCode'
 import NeedKnow from '@/components/NeedKnow'
@@ -152,7 +152,7 @@ export default {
     },
     methods:{
         loadData(){
-            getRleaseInfo(this.orderId).then(res => {
+            getReleaseInfo(this.orderId).then(res => {
               this.detail = res.data
               this.$set(this.formData, 'consigneeName', res.data.consigneeName)
               this.$set(this.formData, 'consigneeCountryCode', '+' + res.data.consigneeCountryCode)

src/views/ecw/order/components/specialNeeds.vue

@@ -6,8 +6,8 @@
       <h1>{{orderNo}} 特需</h1>
       <el-form label-width="180px" label-position="left">
         <el-form-item label="特殊要求">
-          <el-checkbox-group v-model="advanceType">
-            <el-checkbox v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"  :label="item.value" >{{item.label}}</el-checkbox>
+          <el-checkbox-group v-model="advanceType" >
+            <el-checkbox @click="change(item)" v-for="(item) in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)"  :label="item.value" >{{item.label}}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
         <el-form-item label="特殊要求备注"><el-input  type="textarea" style="width: 300px;" v-model="todoDetail"></el-input></el-form-item>
@@ -55,6 +55,7 @@ export default {
       advanceType:[],
       specialNeedsList:[],
       todoDetail:'',
+      echoList:[],
     }
   },
   methods:{
@@ -63,7 +64,25 @@ export default {
         i.todoDetail = this.todoDetail
       })
       let p = this.specialNeedsList.filter(i => this.advanceType.indexOf(i.advanceType) > -1)
-      specialNeedCreate(p).then(r=>{
+       console.log(p,'p')
+      let p1 = []
+      //获取新增的和修改的
+      p.forEach(item => {
+        if(this.echoList.find( i => item.id === i.id)){
+        p1.push(item)
+        }else {
+          item.oper = 'add'
+          p1.push(item)
+        }
+      })
+      //获取删除的
+      this.echoList.forEach(item => {
+       if(!(p.find(i => i.id === item.id))){
+         item.oper = 'del'
+          p1.push(item)
+       }
+      })
+      specialNeedCreate(p1).then(r=>{
         if(r.code === 0){
           this.$emit('update:show',false)
           this.$emit('determine')
@@ -86,6 +105,7 @@ export default {
          })
         //特需回显
         getSpecialListByOrderId(this.orderId).then(r => {
+          this.echoList = r.data;
           r.data.forEach(i => {
             this.advanceType.push(i.advanceType)
            let index = this.specialNeedsList.findIndex(item => i.advanceType == item.advanceType)

src/views/ecw/productPrice/edit.vue

@@ -63,7 +63,7 @@
         <div slot="header" style="font-size:20px;">
           {{$t('价格设置')}}
           <span>
-            <el-checkbox label="" @change="form.advanceStatus=$event ? 1 : 0">{{$t('预付')}}</el-checkbox>
+            <el-checkbox label="" @change="form.needPay=$event ? 1 : 0">{{$t('预付')}}</el-checkbox>
             <el-checkbox label="" @change="form.stepPrice=$event ? 1 : 0">{{$t('阶梯订单')}}</el-checkbox>
           </span>
         </div>

src/views/ecw/productPrice/index.vue

@@ -51,8 +51,11 @@
       <el-form-item :label="$t('审核状态')" prop="auditStatus">
           <dict-selector :type="DICT_TYPE.ECW_PRICE_AUDIT_STATUS" v-model="queryParams.auditStatus" clearable/>
       </el-form-item>
-      <el-form-item :label="$t('状态')" prop="status">
-        // TODO
+      <el-form-item :label="$t('状态')" prop="combStatus">
+        <el-select v-model="queryParams.combStatus" placeholder="请选择状态" clearable>
+          <el-option label="未设置价格" value="setPrice_1"></el-option>
+          <el-option label="黑名单" value="blacklist_1"></el-option>
+        </el-select>
       </el-form-item>
   
       
@@ -566,6 +569,12 @@ export default {
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
+      this.queryParams.setPrice = undefined
+      this.queryParams.blacklist = undefined
+      if(this.queryParams.combStatus){
+        let tmp = this.queryParams.combStatus.split('_')
+        this.queryParams[tmp[0]] = tmp[1]
+      }
       this.getList();
     },
     /** 重置按钮操作 */