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

src/views/ecw/customer/index.vue

@@ -109,9 +109,7 @@
       </el-table-column>
       <el-table-column :label="$t('客户编号')" align="center" prop="number" >
         <template v-slot="{row}">
-          <router-link :to="'/customer/query/' + row.id">
-            {{row.number}}
-          </router-link>
+          {{row.number}}
         </template>
       </el-table-column>
       <el-table-column :label="$t('客户名称')" align="center" prop="name">
@@ -164,7 +162,7 @@
 <!--          <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="[selectAuthorityFn('ecw:customer:query')]">{{$t('查看')}}</el-button>
+                     v-hasPermi="[selectAuthorityFn('ecw:customer:index-query')]">{{$t('查看')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                      v-hasPermi="[selectAuthorityFn('ecw:customer:update')]">{{$t('修改')}}</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"

src/views/ecw/productAttr/edit.vue

@@ -3,14 +3,14 @@
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
 
       <el-form-item :label="$t('适用商品')" prop="idList">
-        <products-selector :defaultIds="form.idList" v-model="form.idList" show-all @setall="toggleAll" />
+        <products-selector ref="productsSelector" :defaultIds="form.idList" v-model="form.idList" show-all @setall="toggleAll" />
       </el-form-item>
 
       <el-form-item :label="$t('货柜位置')" prop="containerLocation">
         <dict-selector :type="DICT_TYPE.ECW_CONTAINER_LOCATION" v-model="form.containerLocation" />
       </el-form-item>
       <el-form-item :label="$t('出运要求')" prop="requirements">
-        <el-checkbox true-label="1" v-model="form.requirements">{{$t('证书要求（支持多证书）')}}</el-checkbox>
+        <el-checkbox :true-label="1" :false-label="0"   v-model="form.requirements">{{$t('证书要求（支持多证书）')}}</el-checkbox>
       </el-form-item>
       <el-form-item :label="$t('订单方数上限')" prop="square">
         <el-input v-model="form.square" placeholder="" class="w-200"></el-input>
@@ -208,7 +208,7 @@ export default {
         "isAllProduct": 0,
         "needBook": undefined,
         "packaging": undefined,
-        "requirements": undefined,
+        "requirements": 0,
         "square": undefined,
         "materialType": undefined,
         priceStepClearanceList:[],
@@ -219,6 +219,8 @@ export default {
       };
       this.attrIds = []
       this.resetForm("form");
+      this.lineNum = 0;
+      this.$refs.productsSelector.empty()
     },
     verify(row){
       return (row.startNum !== '' && row.endNum !== '' && row.clearancePrice !== '' && row.clearancePriceUnit !== '' && row.clearanceVolumeUnit !== '')