用户管理git冲突解决

frontend/src/views/system/user/index.vue

@@ -110,20 +110,6 @@
                                 <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="CircleCheck"
                                     @click="handleAuthRole(scope.row)"></el-button>
                             </el-tooltip>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                            <el-tooltip v-if="scope.row.userId !== 1" content="车牌号录入" placement="top">
-                                <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="List"
-                                    @click="handleAddCar(scope.row)"></el-button>
-                            </el-tooltip>
-                            <el-tooltip v-if="scope.row.userId !== 1" content="座机号录入" placement="top">
-                                <el-button v-hasPermi="['system:user:edit']" link type="primary" icon="PhoneFilled"
-                                    @click="handleAddLandline(scope.row)"></el-button>
-                            </el-tooltip>
-=======
->>>>>>> e94f5f44564039f665611f42b365b51740d0649c
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
                         </template>
                     </el-table-column>
                 </el-table>
@@ -194,25 +180,6 @@
                     </el-col>
                 </el-row>
                 <el-row>
-<<<<<<< HEAD
-<<<<<<< HEAD
-                    <!-- <el-col :span="12">
-                        <el-form-item label="岗位">
-                            <el-select v-model="form.postIds" multiple placeholder="请选择">
-                                <el-option
-                                    v-for="item in postOptions"
-                                    :key="item.postId"
-                                    :label="item.postName"
-                                    :value="item.postId"
-                                    :disabled="item.status == 1"
-                                ></el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col> -->
-=======
->>>>>>> e94f5f44564039f665611f42b365b51740d0649c
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
                     <el-col :span="12">
                         <el-form-item label="角色" prop="roleIds">
                             <el-select @change="getLabel" v-model="form.roleIds" multiple placeholder="请选择">
@@ -269,48 +236,6 @@
                 </div>
             </template>
         </el-dialog>
-<<<<<<< HEAD
-<<<<<<< HEAD
-
-        <!-- 录入车牌号对话框 -->
-        <el-dialog :close-on-click-modal="false" v-model="car.open" :title="car.title" width="400px" append-to-body>
-            <div v-for="(item, index) in plateNo" :key="index" class="mb20">
-                <div class="flex">
-                    <el-input v-model="item.number" placeholder="请输入车牌号" style="width: 70%" />
-                    <el-button class="ml20" v-if="plateNo.length > 1" @click="handleCar(0, index)">-</el-button>
-                    <el-button type="primary" v-if="index + 1 === plateNo.length" class="ml20"
-                        @click="handleCar(1, index)">+</el-button>
-                </div>
-            </div>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button type="primary" @click="submitCarForm">确 定</el-button>
-                    <el-button @click="cancelCar">取 消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-        <!-- 录入座机号对话框 -->
-        <el-dialog :close-on-click-modal="false" v-model="landline.open" :title="landline.title" width="400px"
-            append-to-body>
-            <div v-for="(item, index) in landlineNo" :key="index" class="mb20">
-                <div class="flex">
-                    <el-input v-model="item.number" placeholder="请输入座机号" style="width: 70%" />
-                    <el-button class="ml20" v-if="landlineNo.length > 1" @click="handleLandline(0, index)">-</el-button>
-                    <el-button type="primary" v-if="index + 1 === landlineNo.length" class="ml20"
-                        @click="handleLandline(1, index)">+</el-button>
-                </div>
-            </div>
-            <template #footer>
-                <div class="dialog-footer">
-                    <el-button type="primary" @click="submitLandlineNoForm">确 定</el-button>
-                    <el-button @click="cancelLandline">取 消</el-button>
-                </div>
-            </template>
-        </el-dialog>
-=======
->>>>>>> e94f5f44564039f665611f42b365b51740d0649c
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
     </div>
 </template>
 
@@ -374,128 +299,6 @@ const upload = reactive({
     // 上传的地址
     url: import.meta.env.VITE_APP_BASE_API + '/system/user/importData',
 });
-<<<<<<< HEAD
-<<<<<<< HEAD
-/*** 座机录入参数 */
-const landline = reactive({
-    // 是否显示弹出层
-    open: false,
-    // 弹出层标题
-    title: '座机录入',
-    landlineNumber: '',
-});
-/*** 车牌录入参数 */
-const car = reactive({
-    // 是否显示弹出层
-    open: false,
-    // 弹出层标题
-    title: '车牌录入',
-    jobNumber: '',
-});
-// 车牌录入
-const plateNo = ref([{ number: '' }]);
-// 座机录入
-const landlineNo = ref([{ number: '' }]);
-// const plateNo = ref(['12345', '678910']);
-// 座机录入的确定按钮
-function submitLandlineNoForm() {
-    let landlineNumbers = landlineNo.value.map(item => {
-        return item.number;
-    });
-    if (landlineNumbers.length === 1 && landlineNumbers[0] === '') {
-        landlineNumbers = [];
-    }
-    const data = { landlineNumber: landlineNumbers, jobNumber: landline.landlineNumber };
-    addLandlineNumber(data).then((res: any) => {
-        if (res.code === 200) {
-            ElMessage.success(res.msg);
-            cancelLandline();
-            getList();
-        } else {
-            ElMessage.error(res.msg);
-            cancelLandline();
-            getList();
-        }
-    });
-}
-// 车牌录入的确定按钮
-function submitCarForm() {
-    let carNumbers = plateNo.value.map(item => {
-        return item.number;
-    });
-    if (carNumbers.length === 1 && carNumbers[0] === '') {
-        carNumbers = [];
-    }
-    const data = { plateNo: carNumbers, jobNumber: car.jobNumber };
-    addCarNumber(data).then((res: any) => {
-        if (res.code === 200) {
-            ElMessage.success(res.msg);
-            cancelCar();
-            getList();
-        } else {
-            ElMessage.error(res.msg);
-            cancelCar();
-            getList();
-        }
-    });
-}
-// 车牌的加减
-function handleCar(type, index) {
-    if (type === 0) {
-        plateNo.value.splice(index, 1);
-    }
-    if (type === 1) {
-        plateNo.value.push({ number: '' });
-    }
-}
-// 座机的加减
-function handleLandline(type, index) {
-    if (type === 0) {
-        landlineNo.value.splice(index, 1);
-    }
-    if (type === 1) {
-        landlineNo.value.push({ number: '' });
-    }
-}
-// 车牌录入的取消按钮
-function cancelCar() {
-    car.open = false;
-    plateNo.value = [{ number: '' }];
-}
-// 座机录入的取消按钮
-function cancelLandline() {
-    landline.open = false;
-    landlineNo.value = [{ number: '' }];
-}
-/** 车牌号录入 */
-function handleAddCar(row: any) {
-    car.jobNumber = row.jobNumber;
-    car.open = true;
-    if (row.dhPlateNoVos.length > 0) {
-        plateNo.value = [];
-        row.dhPlateNoVos.forEach((item: any) => {
-            plateNo.value.push({ number: item.plateNo });
-        });
-    }
-    proxy!.resetForm('carRef');
-}
-/** 座机号录入 */
-function handleAddLandline(row: any) {
-    landline.landlineNumber = row.jobNumber;
-    landline.open = true;
-    if (row.landlineNumbers.length > 0) {
-        landlineNo.value = [];
-        row.landlineNumbers.forEach((item: any) => {
-            console.log(item, 'xxx');
-            landlineNo.value.push({ number: item.landlineNumber });
-        });
-    }
-    proxy!.resetForm('carRef');
-}
-=======
->>>>>>> e94f5f44564039f665611f42b365b51740d0649c
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
 // 列显隐信息
 const columns = ref([
     { key: 0, label: `用户编号`, visible: true },
@@ -503,14 +306,7 @@ const columns = ref([
     { key: 2, label: `用户昵称`, visible: true },
     { key: 3, label: `部门`, visible: true },
     { key: 4, label: `手机号码`, visible: true },
-<<<<<<< HEAD
-<<<<<<< HEAD
     { key: 7, label: `工号`, visible: true },
-    { key: 8, label: `车牌号`, visible: true },
-=======
->>>>>>> e94f5f44564039f665611f42b365b51740d0649c
-=======
->>>>>>> 6c90d73fadd504a5827e77c4e8dc469f3608d6d0
     { key: 5, label: `状态`, visible: true },
     { key: 6, label: `创建时间`, visible: true },
 ]);