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

src/components/WorkFlow/index.vue

@@ -12,7 +12,7 @@
         </div>
         <el-form label-position="left" label-width="100px">
           <el-form-item :label="$t('抄送')">
-            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%">
+            <el-select v-model="valueSync" multiple :placeholder="$t('请选择抄送人')" style="width:100%" filterable >
                 <el-option
                 v-for="item in users"
                 :key="item.id"

src/views/ecw/customer/index.vue

@@ -84,7 +84,12 @@
         width="55">
       </el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" prop="number" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="name" />
+      <el-table-column :label="$t('客户名称')" align="center" prop="name">
+        <template slot-scope="{row}">
+          {{row.name}} <el-tag v-if="row.isInOpenSea" size="mini">公</el-tag>
+        </template>
+      </el-table-column>
+
       <el-table-column :label="$t('客户等级')" align="center" prop="vipLevelNameZh">
         <template slot-scope="scope">
           <dict-tag :type="DICT_TYPE.CUSTOMER_LEVEL" :value="scope.row.level" />
@@ -107,8 +112,18 @@
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('入公海时间')" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enterOpenSeaTime) }}</span>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('客户经理')" align="center" prop="customerService" :formatter="customerServiceFn">
       </el-table-column>
+      <el-table-column :label="$t('运输方式')">
+        <template slot-scope="{row}">
+          <dict-tag v-if="row.transportType" v-for="item in row.transportType.split(',')" :type="DICT_TYPE.TRANSPORT_TYPE" :value="item"></dict-tag>
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('国家')" align="center" prop="country" :formatter="countryFormatter"></el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -120,7 +135,7 @@
                      v-hasPermi="['ecw:customer:delete']">{{$t('删除')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-collection" @click="followUp(scope.row)">{{$t('跟进')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-user" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
+          <el-button :disabled="scope.row.isInOpenSea" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
         </template>
       </el-table-column>
     </el-table>