Merge branch 'feature/8月-奥莱定制' into dev

src/views/card/setStaffDialog.vue

@@ -5,10 +5,9 @@
         <el-input class="w304" v-model="form.writeOffName" placeholder="请输入内容" maxlength="10" show-word-limit></el-input>
       </el-form-item>
       <el-form-item label="手机号码：" prop="writeOffPhone" :error="errorRe">
-        <el-select class="w116" :disabled="row.writeOffStoreStaffId" v-model="typeSe" placeholder="请选择">
-          <el-option v-for="item in typeList" :key="item.value" :label="item.label" :value="item.value"> </el-option>
-        </el-select>
-        <el-input :disabled="row.writeOffStoreStaffId" class="w178" v-model="form.writeOffPhone" @blur="phoneChange"></el-input>
+        <el-input :disabled="row.writeOffStoreStaffId" class="w303" v-model="form.writeOffPhone" @blur="phoneChange">
+          <template slot="prepend">中国 +86</template>
+        </el-input>
       </el-form-item>
     </el-form>
     <span slot="footer">
@@ -51,42 +50,21 @@ export default {
         writeOffPhone: '',
         storeId: '',
         writeOffStoreStaffId: '',
-        storeCode: ''
+        storeCode: '',
+        unionId: ''
       },
       rules: {
         writeOffName: [{ required: true, message: '请输入员工姓名', trigger: 'blur' }],
         writeOffPhone: [{ required: true, validator: validatorPhone, trigger: 'blur' }]
       },
-      errorRe: '',
-      typeSe: '1',
-      typeList: [
-        {
-          value: '1',
-          label: '中国    +86'
-        },
-        {
-          value: '2',
-          label: '澳门   +853'
-        },
-        {
-          value: '3',
-          label: '香港   +852'
-        },
-        {
-          value: '4',
-          label: '台湾   +886'
-        }
-      ]
+      errorRe: ''
     };
   },
   methods: {
     async phoneChange() {
       await searchRePhone({ writeOffPhone: this.form.writeOffPhone }).then(res => {
         if (res.errorCode == 0) {
-          // this.rePhone = res.result;
-          // console.log(this.rePhone, 1);
           if (!res.result) {
-            console.log(res.result, 33);
             this.errorRe = '手机号码已存在';
           }
         }
@@ -133,6 +111,7 @@ export default {
           this.form.storeId = val.storeId;
           this.form.writeOffStoreStaffId = val.writeOffStoreStaffId;
           this.form.storeCode = val.storeCode;
+          this.form.unionId = val.unionId;
         } else {
           this.form.storeId = val.storeId;
           this.form.storeCode = val.storeCode;
@@ -143,13 +122,6 @@ export default {
       },
       immediate: true
     }
-    // rePhone: {
-    //   handler: function(val) {
-    //     this.rePhone = val;
-    //     console.log(this.rePhone, 2);
-    //   },
-    //   immediate: true
-    // }
   }
 };
 </script>
@@ -157,13 +129,7 @@ export default {
 .w304 {
   width: 304px;
 }
-.w178 {
-  width: 178px;
-}
-.w116 {
-  width: 116px;
-}
-.mr9 {
-  margin-right: 9px;
+.w303 {
+  width: 303px;
 }
 </style>

src/views/card/store-list.vue

@@ -22,8 +22,8 @@
           </div>
           <div class="c_t_right">
             <el-button type="text" style="margin-right: 12px;" @click="setStraffEvent({ storeId: item.storeId, storeCode: item.storeCode })">新增员工</el-button>
-            <el-popconfirm confirm-button-text="删除" cancel-button-text="取消" icon="el-icon-warning" icon-color="#FA8C16" style="margin-left:6px" @confirm="deleteStoreEvent(item)" title="删除后卡券适用门店无法选择，是否继续？">
-              <el-button slot="reference" type="text">删除</el-button>
+            <el-popconfirm confirm-button-text="删除" cancel-button-text="取消" icon="el-icon-warning" icon-color="#FA8C16" @confirm="deleteStoreEvent(item)" popper-class="my-popper" title="删除后卡券适用门店无法选择，是否继续？">
+              <el-button slot="reference" type="text" style="margin-left:6px">删除</el-button>
             </el-popconfirm>
           </div>
         </div>
@@ -35,8 +35,8 @@
             <el-table-column prop="" label="操作" min-width="114px">
               <template slot-scope="{ row }">
                 <el-button type="text" @click="setStraffEvent(row)">编辑</el-button>
-                <el-popconfirm confirm-button-text="删除" cancel-button-text="取消" icon="el-icon-warning" icon-color="#FA8C16" style="margin-left:20px" @confirm="delstraffEvent(row)" title="删除后员工将无法登录核销小工具，确认删除吗？">
-                  <el-button slot="reference" type="text">删除</el-button>
+                <el-popconfirm confirm-button-text="删除" cancel-button-text="取消" icon="el-icon-warning" icon-color="#FA8C16" popper-class="my-popper" @confirm="delstraffEvent(row)" title="删除后员工将无法登录核销小工具，确认删除吗？">
+                  <el-button slot="reference" type="text" style="margin-left:20px;">删除</el-button>
                 </el-popconfirm>
               </template>
             </el-table-column>
@@ -151,16 +151,12 @@ export default {
 };
 </script>
 <style lang="scss">
-// .el-popconfirm__main {
-//   margin-bottom: 16px;
-// }
-// .el-popper {
-//   max-width: 251px;
-// }
-// .damolish .el-button.el-button--mini {
-//   border: 1px solid #DCDFE6;
-//   color: #303133;
-// }
+.my-popper {
+  max-width: 225px;
+  .el-popconfirm__icon {
+    margin-top: -19px;
+  }
+}
 </style>
 <style lang="scss" scoped>
 .storeBox {