shmily1213 1 месяц назад
Родитель
Сommit
1bf79b4820

+ 2 - 3
back-ui/src/views/dz/cards/components/EditDialog.vue

@@ -127,7 +127,6 @@ const { proxy } = getCurrentInstance();
 
 const modalRef = ref(null);
 const formRef = ref(null);
-const userInfo = ref({});
 const form = ref({
   scores: {},
   directionStudy: []
@@ -194,12 +193,12 @@ const close = () => {
 const getUserInfo = (cardInfo) => {
   const { cardId, location, nickName, outDate } = cardInfo;
   getUserByCardId(cardId).then(async res => {
-    userInfo.value = { ...res.data };
     form.value = {
       ...res.data,
       location,
       nickName,
-      outDate
+      outDate,
+      directionStudy: res.data.directionStudy || []
     };
     const areaList = await getAreaList();
     const area = areaList.find(item => item.areaName === location + '省');

+ 4 - 1
back-ui/src/views/dz/cards/index.vue

@@ -65,7 +65,10 @@
       <el-form-item label="过期状态" prop="timeStatus">
         <ie-select v-model="queryParams.timeStatus" :options="card_time_status" class="w-[180px]!" clearable />
       </el-form-item>
-      <el-form-item label="结算状态" prop="payStatus">
+      <el-form-item label="结算状态" prop="isSettlement">
+        <ie-select v-model="queryParams.isSettlement" :options="bool_values" class="w-[180px]!" clearable />
+      </el-form-item>
+      <el-form-item label="缴费状态" prop="payStatus">
         <ie-select v-model="queryParams.payStatus" :options="card_pay_status" class="w-[180px]!" clearable />
       </el-form-item>
       <el-form-item>