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

src/components/WarehouseAreaDialog/index.vue

@@ -143,9 +143,14 @@ export default {
       this.activeWarehouse = warehouse
       if (!!warehouse.selected) {
         warehouse.selected = false
+        return
       } else if(this.activeWarehouseId !== warehouse.id) {
         this.activeWarehouseId = warehouse.id
-      } else {
+        console.log(this.inputValue.find(e => e.areaId === warehouse.id), warehouse.id)
+        if (this.inputValue.find(e => e.areaId === warehouse.id)){
+          return
+        }
+      }
       warehouse.selected = true
 
       // 区域被选，清空该区域下的位置
@@ -155,7 +160,6 @@ export default {
           k.selected = false
         })
       })
-      }
     },
     handleSelectPositionChild(position) {
       if (!!position.selected) {

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

@@ -133,7 +133,7 @@
   <div v-if="type === 4">
     <p>申请理由</p>
     <div>
-      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ FeeDetails.details.applyInfoVOList[0].newValue }}】信息：
+      用户修改了订单中商品编号为【{{ FeeDetails.orderItemVOList[0].prodId }}】的【{{ prodName }}】信息：
       <ol>
         <template v-for="item in FeeDetails.details.applyInfoVOList">
           <li v-if="item.orgValue === undefined">{{ item.name }}：{{ item.newValue }}</li>
@@ -184,7 +184,9 @@ export default {
       warehouseList:[],
       channelList:[],
       processInstanceID:undefined,
-      list:[]
+      list:[],
+
+      prodName: ''
     }
   },
   created() {
@@ -252,7 +254,10 @@ export default {
             getOrder(res.data.orderIds).then(r =>{
               this.FeeDetails = r.data
               this.FeeDetails.details = JSON.parse(res.data.details)
-              // this.FeeDetails.details = res.data.details
+              const orderItem = this.FeeDetails.orderItemVOList.find(e => e.brand === this.FeeDetails.details.brand)
+              if (orderItem){
+                this.prodName = orderItem.prodTitleZh + '(' + orderItem.prodTitleEn + ')'
+              }
             })
           })
           break

src/views/member/user/underReview.vue

@@ -7,20 +7,8 @@
       <el-form-item :label="$t('关键字')" prop="nickname">
         <el-input v-model="queryParams.searchKey" :placeholder="$t('搜索昵称、姓名、手机、Email')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="成交" prop="mobile">
-        <el-select v-model="queryParams.isDeal">
-          <el-option v-for="item in [{label:$t('全部'),value:''},{label:$t('是'),value:true},{label:$t('否'),value:false}]" :value="item.value" :label="item.label" :key="item.value" ></el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="认证" prop="password">
-        <el-select v-model="queryParams.authType">
-          <el-option v-for="item in [{label: $t('全部'),value: ''},{label:$t('营业执照认证'),value:1},{label:$t('身份证认证'),value:2},{label:$t('双认证'),value:3}]" :key="item.value"  :value="item.value" :label="item.label"></el-option>
-        </el-select>
-      </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>
-        <el-button :loading="exportLoading" type="primary" @click="exportFn">{{$t('导 出')}}</el-button>
       </el-form-item>
     </el-form>
 
@@ -34,48 +22,19 @@
       <el-table-column :label="$t('公司名称')" align="center" prop="enterpriseName" />
       <el-table-column :label="$t('用户昵称')" align="center" prop="nickname" />
       <el-table-column :label="$t('真实姓名')" align="center" prop="identityName" />
-      <el-table-column :label="$t('区号')">
+      <el-table-column  align="center" :label="$t('区号')">
         <template v-slot:default = 'scope'>
           +{{scope.row.areaCode ? `${scope.row.areaCode}`:''}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('手机号')" show-overflow-tooltip align="center" prop="mobile" >
       </el-table-column>
-      <el-table-column :label="$t('成交')" align="center" prop="" show-overflow-tooltip >
-        <template v-slot="{row}">
-          {{row.customerStatus === 3 ? $t('成交') : $t('非成交')}}
-        </template>
-      </el-table-column>
-      <el-table-column label="认证" align="center" :formatter="authentication" />
-      <el-table-column label="状态" align="center" prop="status" >
-        <template slot-scope="scope">
-          <el-switch v-model="scope.row.status" :active-value="0" :inactive-value="1" @change="handleStatusChange(scope.row)" />
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('身份证审核状态')" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <div v-if="!scope.row.identityAuditStatus">{{$t('未提交')}}</div>
-          <dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.identityAuditStatus" ></dict-tag>
-          <el-tooltip  v-if="scope.row.identityAuditStatus === 3" class="item" effect="dark" :content="scope.row.identityAuditRemark" placement="bottom">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('营业执照审核状态')" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <div v-if="!scope.row.enterpriseAuditStatus">{{$t('未提交')}}</div>
-          <dict-tag v-else :type="DICT_TYPE.AUDIT_STATUS" :value="scope.row.enterpriseAuditStatus" ></dict-tag>
-          <el-tooltip  v-if="scope.row.enterpriseAuditStatus === 3" class="item" effect="dark" :content="scope.row.rowenterpriseAuditRemark" placement="bottom">
-            <i class="el-icon-question"></i>
-          </el-tooltip>
-        </template>
-      </el-table-column>
-      <el-table-column :label="$t('提交审核时间')" align="center" prop="createTime" width="180">
+      <el-table-column :label="$t('提交审核时间')" align="center" prop="createTime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.identityAuditCreateTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width" width="200px">
+      <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
           <el-button v-if="scope.row.identityAuditStatus !== 0 && scope.row.identityAuditStatus !== undefined" size="mini" type="text"  @click="identityFn(scope.row , '1')">{{$t('身份证审核')}}</el-button>
         </template>
@@ -150,7 +109,7 @@ import {
   memberGetAuthEnterpriseInfo,
   memberUserAuditIdCard,
   memberUserUpdateIdCard,
-  memberUserUpdateEnterprise, setUserUpdateStatus, userCreateAuditEnterprise
+  memberUserUpdateEnterprise, setUserUpdateStatus, userCreateAuditEnterprise, getWaitApprovePage
 } from "@/api/member/user";
 import {DICT_TYPE, getDictDatas} from "@/utils/dict";
 import FileUpload  from "@/components/FileUpload"
@@ -198,7 +157,7 @@ export default {
         isDeal:undefined,//	是否成交
         searchKey:undefined,//关键字
         auditStatus:1,//审核状态
-        authType:undefined,//关键字
+        authType:2,//关键字
       },
       // 表单参数
       form: {},
@@ -270,7 +229,7 @@ export default {
       this.addBeginAndEndTime(params, this.dateRangeLoginDate, 'loginDate');
       this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
       // 执行查询
-      getUserPage(params).then(response => {
+      getWaitApprovePage(params).then(response => {
         this.list = response.data.list;
         this.total = response.data.total;
         this.loading = false;
@@ -323,7 +282,7 @@ export default {
         isDeal:undefined,//	是否成交
         searchKey:undefined,//关键字
         auditStatus:1,//审核状态
-        authType:undefined,//关键字
+        authType:2,//关键字
       }
       this.handleQuery();
     },
@@ -386,17 +345,6 @@ export default {
         }
       })
     },
-    authentication(row){
-      if(!row.identityAuditStatus && !row.enterpriseAuditRemark){
-        return this.$t('否')
-      }else if(row.identityAuditStatus >= 0 && row.enterpriseAuditRemark >= 0){
-        return this.$t('双认证')
-      } else if(row.identityAuditStatus >= 0){
-        return this.$t('身份')
-      }else if(row.enterpriseAuditRemark >= 0){
-        return this.$t('营业')
-      }
-    },
     submit(){
       let p = {
         cardNumber:this.enterpriseFrom.cardNumber,