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

src/views/bpm/processInstance/index.vue

@@ -30,6 +30,10 @@
                      :key="dict.value" :label="dict.label" :value="dict.value"/>
         </el-select>
       </el-form-item>
+      <el-form-item :label="$t('业务编号')" prop="businessNo">
+        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -126,6 +130,7 @@ export default {
         category: null,
         status: null,
         result: null,
+
       }
     };
   },

src/views/bpm/task/copy.vue

@@ -18,6 +18,10 @@
         <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')"/>
       </el-form-item>
+      <el-form-item :label="$t('业务编号')" prop="businessNo">
+        <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
+                  @keyup.enter.native="handleQuery"/>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>

src/views/bpm/task/done.vue

@@ -21,10 +21,10 @@
                         type="daterange" range-separator="-" :start-placeholder="$t('开始日期')"
                         :end-placeholder="$t('结束日期')"/>
       </el-form-item>
-      <!-- el-form-item :label="$t('业务编号')" prop="businessNo">
+       <el-form-item :label="$t('业务编号')" prop="businessNo">
         <el-input v-model="queryParams.businessNo" :placeholder="$t('请输入业务编号')" clearable
                   @keyup.enter.native="handleQuery"/>
-      </el-form-item> -->
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t('重置') }}</el-button>

src/views/ecw/offer/channel-route.vue

@@ -260,17 +260,17 @@ export default {
                 :label="$l(item, 'name')"></el-option>
             </el-select>
           </el-col>
-          <el-col :span="2">
-            <el-button type="primary" @click="newChannelsAdd(index)">新增渠道</el-button>
+          <el-col :span="3">
+            <el-button size="mini" type="primary" @click="newChannelsAdd(index)">新增渠道</el-button>
           </el-col>
-          <el-col :span="2">
-            <el-button type="danger" :disabled="form.channelList.length === 1" @click="channelsDelete(index)">
+          <el-col :span="3">
+            <el-button size="mini" type="danger" :disabled="form.channelList.length === 1" @click="channelsDelete(index)">
               删除当前渠道
             </el-button>
           </el-col>
-          <el-col :span="2">
+          <el-col :span="3">
             <air-freight-route-template :lineId="lineId" @copy="copy">
-              <el-button v-if="index === 0" type="text">选择渠道包装模板</el-button>
+              <el-button size="mini" v-if="index === 0" type="text">选择渠道包装模板</el-button>
             </air-freight-route-template>
           </el-col>
         </el-row>

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

@@ -20,7 +20,9 @@ export default {
       form: {},
       queryParams: {
         pageSize:20,
-        transportType:3
+        transportType:3,
+        startWarehouseIdList:[],
+        destWarehouseIdList: []
       }
     }
   },
@@ -74,13 +76,13 @@ export default {
         <template #header>
           <el-form inline>
             <el-form-item label="始发地">
-              <el-select v-model="form.startWarehouseId" :placeholder="$t('请选择始发地')">
+              <el-select v-model="queryParams.startWarehouseIdList" @change="getList()"  multiple :placeholder="$t('请选择始发地')">
                 <el-option v-for="item in exportWarehouseList"  :label="$l(item, 'title')" :value="item.id"
                            :key="item.id"></el-option>
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('目的地')" prop="destWarehouseId">
-              <el-select v-model="form.destWarehouseId" :placeholder="$t('请选择目的地')">
+              <el-select @change="getList()"  v-model="queryParams.destWarehouseIdList" multiple :placeholder="$t('请选择目的地')">
                 <el-option v-for="item in importWarehouseList" :label="$l(item, 'title')" :value="item.id"
                            :key="item.id"></el-option>
               </el-select>
@@ -90,12 +92,12 @@ export default {
         <el-table border :data="list">
           <el-table-column label="始发仓">
             <template slot-scope="{row}">
-              {{ $l(exportWarehouseList.find(i => i.id === row.startWarehouseId), 'title') }}
+              {{ $l(row, 'startWarehouseTitle') }}
             </template>
           </el-table-column>
           <el-table-column label="目的仓">
             <template slot-scope="{row}">
-              {{ $l(importWarehouseList.find(i => i.id === row.destWarehouseId), 'title') }}
+              {{ $l(row, 'destWarehouseTitle') }}
             </template>
           </el-table-column>
           <el-table-column label="渠道数">