同步6/16

src/views/system/Sdb/SdbBill/index.vue

@@ -10,12 +10,7 @@
                 <el-option v-for="(item, index) in chargeItems" :key="index" :value="item.id" :label="item.itemName"></el-option>
               </el-select>
             </el-form-item>
-            <!-- <el-form-item label="精确查询" prop="type">
-              <el-select style="width: 150px; margin-right: 10px" v-model="queryParams.type">
-                <el-option v-for="(item, index) in com_bill_search_filter" :key="index" :value="item.value" :label="item.label"></el-option>
-              </el-select>
-              <el-input v-model="queryParams.billCode" placeholder="请输入" clearable @keyup.enter="handleQuery" />
-            </el-form-item> -->
+
             <el-form-item>
               <el-button type="primary" @click="handleQuery">搜索</el-button>
               <el-button @click="resetQuery">重置</el-button>
@@ -27,17 +22,6 @@
     <el-card class="flex-1" shadow="never">
       <template #header>
         <el-row :gutter="10" class="mb8">
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['bill:bill:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['bill:bill:edit']">编辑</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:bill:remove']"
-              >删除</el-button
-            >
-          </el-col> -->
           <right-toolbar :show-add="checkPermi(['bill:bill:add'])" :show-edit="false" :show-delete="false" @update:add="handleAdd"></right-toolbar>
         </el-row>
       </template>
@@ -57,11 +41,6 @@
           </template>
         </el-table-column>
         <el-table-column label="收费项目" align="center" prop="chargeItemName" />
-        <!-- <el-table-column label="收费周期" align="center" prop="chargePeriod" width="80">
-          <template #default="scope">
-            <dict-tag :options="com_bill_charge_period" :value="scope.row.chargePeriod"></dict-tag>
-          </template>
-        </el-table-column> -->
         <el-table-column label="起止时间" align="center">
           <template #default="scope">
             <span>{{ parseTime(scope.row.startDate, '{y}/{m}/{d}') }}</span> -
@@ -70,23 +49,20 @@
         </el-table-column>
         <el-table-column label="单价" align="center" width="180">
           <template #default="scope">
-            <div class="flex justify-center">
+            <div class="flex justify-center" v-if="scope.row.unit">
               <span>{{ scope.row.fixedPrice }}</span> /
               <dict-tag :options="com_charge_item_unit" :value="scope.row.unit"></dict-tag>
             </div>
+            <span v-else>---</span>
           </template>
         </el-table-column>
-        <!-- <el-table-column label="数量" align="center" prop="chargePeriod" />
-        <el-table-column label="费用合计" align="center" prop="chargePeriod" /> -->
         <el-table-column label="操作" width="120" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-button link type="primary" @click="handleUpdate(scope.row)" v-hasPermi="['bill:bill:edit']">编辑</el-button>
             <el-button link type="primary" @click="handleMain(scope.row)" v-hasPermi="['bill:bill:query']">详情</el-button>
-            <!-- <el-button link type="primary" @click="handleDelete(scope.row)" v-hasPermi="['system:bill:remove']">删除</el-button> -->
           </template>
         </el-table-column>
       </el-table>
-
       <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
     </el-card>
   </div>
@@ -99,14 +75,11 @@ import { listChargeItem } from '@/api/system/SdbChargeItem';
 import { checkPermi } from '@/utils/permission';
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const { com_bill_search_filter } = toRefs<any>(proxy?.useDict('com_bill_search_filter'));
 const { com_questionnaire_scope } = toRefs<any>(proxy?.useDict('com_questionnaire_scope'));
-// const { com_bill_charge_period } = toRefs<any>(proxy?.useDict('com_bill_charge_period'));
 const { com_bill_charge_scope_house } = toRefs<any>(proxy?.useDict('com_bill_charge_scope_house'));
 const { com_charge_item_unit } = toRefs<any>(proxy?.useDict('com_charge_item_unit'));
 
 const billList = ref<BillVO[]>([]);
-const buttonLoading = ref(false);
 const loading = ref(true);
 const showSearch = ref(true);
 const ids = ref<Array<string | number>>([]);
@@ -115,12 +88,6 @@ const multiple = ref(true);
 const total = ref(0);
 
 const queryFormRef = ref<ElFormInstance>();
-const billFormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 
 const ShowHouselist = ['2049026484272791553', '2049026503017136129'];
 
@@ -143,8 +110,6 @@ const data = reactive<PageData<BillForm, BillQuery>>({
     pageSize: 20,
     chargeItemId: '',
     billCode: ''
-    // type: '',
-    // value: ''
   }
 });
 
@@ -152,7 +117,7 @@ const { queryParams, form } = toRefs(data);
 
 const chargeItems = ref([]);
 function init() {
-  listChargeItem().then((res) => {
+  listChargeItem({}).then((res) => {
     chargeItems.value = res.rows;
   });
 }
@@ -217,14 +182,6 @@ function handleMain(row) {
   });
 }
 
-/** 删除按钮操作 */
-const handleDelete = async (row?: BillVO) => {
-  const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除账单管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
-  await delBill(_ids);
-  proxy?.$modal.msgSuccess('删除成功');
-  await getList();
-};
 
 onMounted(() => {
   getList();