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

src/views/ecw/customer/index.vue

@@ -127,8 +127,8 @@
       <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">
-          <el-button size="mini" type="text" v-show="'development' === env"  @click="seasPond(scope.row)"
-                     v-hasPermi="['ecw:customer:query']">{{$t('掉入公海池')}}</el-button>
+<!--          <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>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"

src/views/ecw/customer/query.vue

@@ -116,7 +116,7 @@
                   <el-form-item :label="$t('报关方式：')">
                     <dict-selector
                       :type="DICT_TYPE.ECW_CUSTOMS_TYPE"
-                      v-model="queryParams.customerType"
+                      v-model="queryParams.customsType"
                     />
                   </el-form-item>
                   <el-form-item :label="$t('控货')">
@@ -207,6 +207,9 @@
                 prop="consignorName"
                 :label="$t('客户名称')"
               >
+                <template v-slot>
+                  {{customer.name}}
+                </template>
               </el-table-column>
               <el-table-column
                 prop="objectiveName"
@@ -489,7 +492,8 @@ export default {
         3:this.$t('跟进中'),
         4:this.$t('赢单'),
         5:this.$t('输单'),
-        6:this.$t('报价完成')
+        6:this.$t('报价完成'),
+        7:this.$t('跟进中')
       },
       dialogVisible:false,
       DICT_TYPE,
@@ -623,11 +627,11 @@ export default {
     },
     changeDate(val){
      if(val){
-        this.queryParams.houseStartDate =  val[0];
-       this.queryParams.houseEndDate =  val[1];
+        this.queryParams.beginRucangTime =  val[0];
+       this.queryParams. endRucangTime =  val[1];
      }else {
-       this.queryParams.houseStartDate = undefined;
-       this.queryParams.houseEndDate =  undefined;
+       this.queryParams.beginRucangTime = undefined;
+       this.queryParams.endRucangTime =  undefined;
      }
     },
     //品牌授权
@@ -655,7 +659,7 @@ export default {
    },
     //订单
     getorderList(){
-      infoListOrderPage({customerId:this.id,...this.queryParams}).then(r => {
+      infoListOrderPage({customerDetailld:this.id,...this.queryParams}).then(r => {
         console.log(r)
         if(r.code === 0){
           this.orderList = r.data.list

src/views/ecw/offer/edit.vue

@@ -221,8 +221,8 @@
                 </template>
                 <template slot-scope="scope">
                     <el-form-item label=""
-                        :prop="`prodCreateReqVOList.${scope.$index}.worth`"
-                        :rules="{
+                        :prop2="`prodCreateReqVOList.${scope.$index}.worth`"
+                        :rules2="{
                             // required: true, message: $t('货值不能为空'), trigger: 'blur'
                         }"
                         class="mb-0 mr-0"

src/views/ecw/order/index.vue

@@ -322,7 +322,6 @@
             </template>
 
             <el-divider direction="vertical" v-if="scope.row.status != 0"></el-divider>
-
             <!--打印相关的-->
             <el-dropdown v-if="scope.row.status != 0">
               <el-button type="text">{{$t('打印')}}</el-button>