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

src/views/ecw/customer/index.vue

@@ -69,15 +69,15 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
+                   v-hasPermi="[ selectAuthorityFn('ecw:customer:create')]">{{$t('新增')}}</el-button>
       </el-col>
       <el-col :span="1.5" >
         <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="transferShow = true;"
-                   v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
+                   v-hasPermi="[selectAuthorityFn('ecw:customer:batch-transfer')]">{{$t('批量移交')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
+                   v-hasPermi="[selectAuthorityFn('ecw:customer:export')]">{{$t('导出')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button :disabled="!selectCustomerList.length" @click="setChangeCustomerAir(true)" v-if="$route.path === '/customer/customer'" type="primary" plain  size="mini"  :loading="exportLoading"
@@ -149,14 +149,14 @@
 <!--          <el-button size="mini" type="text" v-show="'development' === env && scope.row.isInOpenSea"  @click="seasPond(scope.row)"-->
 <!--                     v-hasPermi="['ecw:customer:query']">{{$t('掉入公海池')}}</el-button>-->
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-                     v-hasPermi="['ecw:customer:query']">{{$t('查看')}}</el-button>
+                     v-hasPermi="[selectAuthorityFn('ecw:customer:query')]">{{$t('查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['ecw:customer:update']">{{$t('修改')}}</el-button>
+                     v-hasPermi="[selectAuthorityFn('ecw:customer:update')]">{{$t('修改')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     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 :disabled="scope.row.isInOpenSea" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
+                     v-hasPermi="[selectAuthorityFn('ecw:customer:delete')]">{{$t('删除')}}</el-button>
+          <el-button size="mini" v-has-permi="[selectAuthorityFn('ecw:customer:follow-up')]" type="text" icon="el-icon-collection" @click="followUp(scope.row)">{{$t('跟进')}}</el-button>
+          <el-button size="mini" v-has-permi="[selectAuthorityFn('ecw:customer:customer-complaint')]" type="text" icon="el-icon-user" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
+          <el-button :disabled="scope.row.isInOpenSea" v-has-permi="[selectAuthorityFn('ecw:customer:postpone')]" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -610,6 +610,22 @@ export default {
     },
     isChinese(){
       return this.$i18n.locale === 'zh_CN'
+    },
+    authorityFn(){
+      let i = ''
+      switch (this.$route.path){
+        case '/customer/department-customers':
+          i = 'dep-'
+          break;
+      }
+      return i
+    },
+    selectAuthorityFn(){
+      return (val)=>{
+           let t = val.split(":")
+           t[t.length - 1] = this.authorityFn + t[t.length - 1]
+           return t.join(":")
+      }
     }
   },
   watch:{
@@ -680,7 +696,6 @@ export default {
     },
     /** 查询列表 */
     getList() {
-      console.log(this.$route.path,'path')
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};

src/views/ecw/customer/indirectCustomer.vue

@@ -31,8 +31,7 @@
       <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>
-        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                                                                                                   v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" v-hasPermi="['ecw:customer:indirect-export']">{{$t('导出')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -79,7 +78,7 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('完善')}}</el-button>
+          <el-button v-has-permi="['ecw:customer:indirect:perfect']" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('完善')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/customer/query.vue

@@ -5,11 +5,11 @@
         <div style="display: flex;justify-content: space-between;align-items: flex-end;">
           <h2>{{$t('查看')}}</h2>
           <div>
-            <el-button type="primary" size="small" @click="$router.push('/customer/edit/' + id)">{{$t('编辑')}}</el-button>
-            <el-button @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
-            <el-button type="primary" size="small" @click="$refs['customerFollow'].customerFollow.dialogVisible = true">{{$t('跟进')}}</el-button>
-            <el-button type="primary" size="small" @click="$refs['customerComplaint'].handleAdd()">{{$t('客诉')}}</el-button>
-            <el-button  v-hasPermi="['ecw:customer:delete']" type="danger" size="small" @click="deleteCustomerFn()">{{$t('删除')}}</el-button>
+            <el-button type="primary" size="small" v-has-permi="['ecw:customer:query-edit']" @click="$router.push('/customer/edit/' + id)">{{$t('编辑')}}</el-button>
+            <el-button v-has-permi="['ecw:customer:query-quoted-price']" @click="$router.push('/offer/create')" type="primary" size="small">{{$t('报价')}}</el-button>
+            <el-button v-has-permi="['ecw:customer:query-follow-up']" type="primary" size="small" @click="$refs['customerFollow'].customerFollow.dialogVisible = true">{{$t('跟进')}}</el-button>
+            <el-button v-has-permi="['ecw:customer:query-customer-complaint']" type="primary" size="small" @click="$refs['customerComplaint'].handleAdd()">{{$t('客诉')}}</el-button>
+            <el-button  v-hasPermi="['ecw:customer:query-delete']" type="danger" size="small" @click="deleteCustomerFn()">{{$t('删除')}}</el-button>
           </div>
         </div>
         <el-card style="margin-top: 15px;">
@@ -466,7 +466,6 @@ export default {
     CustomerComplaint
   },
   created() {
-    this.permissions
     //获取信用类型
     getCreditRulePage({page:1,rows:999,type:2}).then(r => {
      this.creditTypeList = r.data.list

src/views/ecw/customerCommission/index.vue

@@ -64,7 +64,7 @@
           <div style="flex: 1">
             <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
             <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button></div>
-          <div style="flex: 1; text-align: right;">
+          <div style="flex: 1; text-align: right;" v-has-permi="['ecw:customer:commission-set']">
             <router-link :to="'/customerCommissionInfo/'+ 0 ">
               <el-button type="primary">{{$t('佣金设置')}}</el-button>
             </router-link>
@@ -126,8 +126,8 @@
       </el-table-column>
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
         <template slot-scope="scope">
-          <el-button size="mini" type="text" icon="el-icon-view" @click="handleUpdate(scope.row)">{{ $t('查看') }}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">{{$t('删除')}}</el-button>
+          <el-button v-has-permi="['ecw:customer:commission-query']" size="mini" type="text" icon="el-icon-view" @click="handleUpdate(scope.row)">{{ $t('查看') }}</el-button>
+          <el-button v-has-permi="['ecw:customer:commission-delete']" size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)">{{$t('删除')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/customerConfirm/index.vue

@@ -67,11 +67,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="$router.push({path:'/customer/add-edit/0',query:{isCustomerServiceConfirmed:true,}})"
-                   v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
+                   v-hasPermi="['ecw:customer: treat-create']">{{$t('新增')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
+                   v-hasPermi="['ecw:customer:treat-export']">{{$t('导出')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -117,16 +117,16 @@
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text"  @click="handleConfirmService(scope.row)"
-                     v-hasPermi="['ecw:customer:update']">{{$t('确认接收')}}</el-button>
+                     v-hasPermi="['ecw:customer:treat-accept']">{{$t('确认接收')}}</el-button>
           <el-button size="mini" type="text"  @click="handOver(scope.row)"
-                     v-hasPermi="['ecw:customer:update']">{{$t('移交')}}</el-button>
+                     v-hasPermi="['ecw:customer:treat-transfer']">{{$t('移交')}}</el-button>
            <router-link style="margin: 0 10px;" to="/offer/create">
-             <el-button  size="mini" type="text">
+             <el-button v-has-permi="['ecw:customer:treat-quoted-price']"  size="mini" type="text">
                {{$t('报价')}}
              </el-button>
            </router-link>
           <el-button size="mini" type="text"   @click="handleUpdate(scope.row)"
-                     v-hasPermi="['ecw:customer:update']">{{$t('完善')}}</el-button>
+                     v-hasPermi="['ecw:customer:treat-perfect']">{{$t('完善')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/customerToBeAssigned/index.vue

@@ -68,16 +68,16 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
+                   v-hasPermi="['ecw:customer:distribution-create']">{{$t('新增')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
+                   v-hasPermi="['ecw:customer:distribution-export']">{{$t('导出')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-col :span="1.5" >
           <el-button :disabled="selectCustomerList.length === 0"  type="primary" size="mini" @click="batchTransferShow = true;"
-                     v-hasPermi="['ecw:customer:export']">{{$t('批量移交')}}</el-button>
+                     v-hasPermi="['ecw:customer:distribution-transfer']">{{$t('批量移交')}}</el-button>
         </el-col>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -125,11 +125,11 @@
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['ecw:customer:update']">{{$t('编辑')}}</el-button>
+                     v-hasPermi="['ecw:customer:distribution-update']">{{$t('编辑')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['ecw:customer:delete']">{{$t('删除')}}</el-button>
+                     v-hasPermi="['ecw:customer:distribution-delete']">{{$t('删除')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="distribution(scope.row)"
-                     v-hasPermi="['ecw:customer:delete']">{{$t('分配客服')}}</el-button>
+                     v-hasPermi="['ecw:customer:distribution-customer-service']">{{$t('分配客服')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/myCustomerService/index.vue

@@ -63,11 +63,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
+                   v-hasPermi="['ecw:customer:my-create']">{{$t('新增')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
+                   v-hasPermi="['ecw:customer:my-export']">{{$t('导出')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -119,15 +119,15 @@
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)"
-                     v-hasPermi="['ecw:customer:query']">{{$t('查看')}}</el-button>
+                     v-hasPermi="['ecw:customer:my-query']">{{$t('查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
-                     v-hasPermi="['ecw:customer:update']">{{$t('修改')}}</el-button>
-          <el-button size="mini" type="text" icon="el-icon-collection" @click="followUp(scope.row)">{{$t('跟进')}}</el-button>
+                     v-hasPermi="['ecw:customer:my-update']">{{$t('修改')}}</el-button>
+          <el-button size="mini" v-hasPermi="['ecw:customer:my-follow-up']" type="text" icon="el-icon-collection" @click="followUp(scope.row)">{{$t('跟进')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-user"
-                     v-hasPermi="['ecw:customer:update']" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
+                     v-hasPermi="['ecw:customer:my-customer-complaint']" @click="complaint(scope.row)">{{$t('客诉')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
-                     v-hasPermi="['ecw:customer:delete']">{{$t('删除')}}</el-button>
-         <el-button :disabled="scope.row.isInOpenSea" size="mini" type="text" icon="el-icon-user" @click="delay(scope.row)">{{$t('延期')}}</el-button>
+                     v-hasPermi="['ecw:customer:my-delete']">{{$t('删除')}}</el-button>
+          <el-button v-has-permi="['ecw:customer:my-postpone']" :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>

src/views/ecw/oceanCustomer/index.vue

@@ -68,11 +68,11 @@
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
-                   v-hasPermi="['ecw:customer:create']">{{$t('新增')}}</el-button>
+                   v-hasPermi="['ecw:customer:sea-create']">{{$t('新增')}}</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
-                   v-hasPermi="['ecw:customer:export']">{{$t('导出')}}</el-button>
+                   v-hasPermi="['ecw:customer:sea-export']">{{$t('导出')}}</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -124,7 +124,7 @@
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
 <!--          <el-button size="mini" type="text"  @click="distribution(scope.row)">{{$t('移交')}}</el-button>-->
-          <el-button size="mini" type="text"  @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button>
+          <el-button v-has-permi="['ecw:customer:sea-gain']" size="mini" type="text"  @click="fishingFn(scope.row)">{{$t('捞取')}}</el-button>
         </template>
       </el-table-column>
     </el-table>

src/views/ecw/order/pending.vue

@@ -98,6 +98,11 @@
           </template>
         </el-table-column>
         <el-table-column :label="$t('处理人')" align="center" prop="userName" />
+        <el-table-column :label="$t('创建时间')" align="center">
+          <template slot-scope="scope">
+             <span>{{parseTime(scope.row.createTime)}}</span>
+            </template>
+          </el-table-column>
         <el-table-column :label="$t('处理时间')" align="center">
           <template slot-scope="scope">
              <span>{{parseTime(scope.row.handlerTime)}}</span>

src/views/ecw/order/prepayDeal.vue

@@ -101,6 +101,16 @@
             <span>{{orderData.sumNum||0}}{{$t('箱')}} {{orderData.wvolume||0}}m³  {{orderData.vweight||0}}Kg  {{orderData.sumQuantity||0}}{{$t('个')}}</span>
           </el-form-item>
         </el-row>
+        <el-row>
+          <el-form-item :label="$t('创建时间')+':'">
+            <span>{{parseTime(orderExceptionData.createTime)}}</span>
+          </el-form-item>
+        </el-row>
+        <el-row>
+          <el-form-item :label="$t('处理时间')+':'">
+               <span>{{parseTime(orderExceptionData.handlerTime)||'/'}}</span>
+          </el-form-item>
+        </el-row>
        </div>
      </el-form>