From c5cde1ff5d5e26310e7a5e15f970db034efda7fa Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Thu, 28 Dec 2023 20:31:52 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production.example | 3 ---
 src/config/index.ts     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
 delete mode 100644 .env.production.example

diff --git a/.env.production.example b/.env.production.example
deleted file mode 100644
index 1e1ea2b..0000000
--- a/.env.production.example
+++ /dev/null
@@ -1,3 +0,0 @@
-NODE_ENV = 'production'
-# Base API
-VITE_APP_BASE_URL=''
\ No newline at end of file
diff --git a/src/config/index.ts b/src/config/index.ts
index cc6bfb3..03bbc36 100644
--- a/src/config/index.ts
+++ b/src/config/index.ts
@@ -2,7 +2,7 @@ const config = {
   terminal: 1, //终端
   title: "后台管理系统", //网站默认标题
   version: "1.6.0", //版本号
-  baseUrl: `${import.meta.env.VITE_APP_BASE_URL || "https://ceshi-engineering.lihaink.cn"}/`, //请求接口域名
+  baseUrl: `${import.meta.env.VITE_APP_BASE_URL || ""}/`, //请求接口域名
   urlPrefix: "adminapi", //请求默认前缀
   timeout: 10 * 1000, //请求超时时长
 };

From ba066893da6aecb05c6739b56c40f740ed7f043b Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Thu, 28 Dec 2023 22:26:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/cost_budget_detail.ts                 |  26 +++
 src/api/subcontracting_contract_detail.ts     |  26 +++
 src/views/cost_budget_detail/edit.vue         | 170 ++++++++++++++++++
 src/views/cost_budget_detail/index.vue        | 167 +++++++++++++++++
 .../expense_reimbursement_detail/index.vue    |   7 +-
 .../subcontracting_contract_detail/index.vue  |  29 +--
 6 files changed, 408 insertions(+), 17 deletions(-)
 create mode 100644 src/api/cost_budget_detail.ts
 create mode 100644 src/api/subcontracting_contract_detail.ts
 create mode 100644 src/views/cost_budget_detail/edit.vue
 create mode 100644 src/views/cost_budget_detail/index.vue

diff --git a/src/api/cost_budget_detail.ts b/src/api/cost_budget_detail.ts
new file mode 100644
index 0000000..2c44504
--- /dev/null
+++ b/src/api/cost_budget_detail.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 预算明细列表
+export function apiCostBudgetDetailLists(params: any) {
+    return request.get({ url: '/cost.cost_budget_detail/lists', params })
+}
+
+// 添加预算明细
+export function apiCostBudgetDetailAdd(params: any) {
+    return request.post({ url: '/cost.cost_budget_detail/add', params })
+}
+
+// 编辑预算明细
+export function apiCostBudgetDetailEdit(params: any) {
+    return request.post({ url: '/cost.cost_budget_detail/edit', params })
+}
+
+// 删除预算明细
+export function apiCostBudgetDetailDelete(params: any) {
+    return request.post({ url: '/cost.cost_budget_detail/delete', params })
+}
+
+// 预算明细详情
+export function apiCostBudgetDetailDetail(params: any) {
+    return request.get({ url: '/cost.cost_budget_detail/detail', params })
+}
\ No newline at end of file
diff --git a/src/api/subcontracting_contract_detail.ts b/src/api/subcontracting_contract_detail.ts
new file mode 100644
index 0000000..64e39c4
--- /dev/null
+++ b/src/api/subcontracting_contract_detail.ts
@@ -0,0 +1,26 @@
+import request from '@/utils/request'
+
+// 分包合同-分包明细列表
+export function apiSubcontractingContractDetailLists(params: any) {
+    return request.get({ url: '/contract.subcontracting_contract_detail/lists', params })
+}
+
+// 添加分包合同-分包明细
+export function apiSubcontractingContractDetailAdd(params: any) {
+    return request.post({ url: '/contract.subcontracting_contract_detail/add', params })
+}
+
+// 编辑分包合同-分包明细
+export function apiSubcontractingContractDetailEdit(params: any) {
+    return request.post({ url: '/contract.subcontracting_contract_detail/edit', params })
+}
+
+// 删除分包合同-分包明细
+export function apiSubcontractingContractDetailDelete(params: any) {
+    return request.post({ url: '/contract.subcontracting_contract_detail/delete', params })
+}
+
+// 分包合同-分包明细详情
+export function apiSubcontractingContractDetailDetail(params: any) {
+    return request.get({ url: '/contract.subcontracting_contract_detail/detail', params })
+}
\ No newline at end of file
diff --git a/src/views/cost_budget_detail/edit.vue b/src/views/cost_budget_detail/edit.vue
new file mode 100644
index 0000000..2c0fa01
--- /dev/null
+++ b/src/views/cost_budget_detail/edit.vue
@@ -0,0 +1,170 @@
+<template>
+    <div class="edit-popup">
+        <popup
+            ref="popupRef"
+            :title="popupTitle"
+            :async="true"
+            width="550px"
+            @confirm="handleSubmit"
+            @close="handleClose"
+        >
+            <el-form ref="formRef" :model="formData" label-width="90px" :rules="formRules">
+                <el-form-item label="一级科目id" prop="cost_subject_id">
+                    <el-input v-model="formData.cost_subject_id" clearable placeholder="请输入一级科目id" />
+                </el-form-item>
+                <el-form-item label="费用明细id" prop="gc_cost_budget_id">
+                    <el-input v-model="formData.gc_cost_budget_id" clearable placeholder="请输入费用明细id" />
+                </el-form-item>
+                <el-form-item label="部门id" prop="dept_id">
+                    <el-input v-model="formData.dept_id" clearable placeholder="请输入部门id" />
+                </el-form-item>
+                <el-form-item label="1月" prop="month1">
+                    <el-input v-model="formData.month1" clearable placeholder="请输入1月" />
+                </el-form-item>
+                <el-form-item label="2月" prop="month2">
+                    <el-input v-model="formData.month2" clearable placeholder="请输入2月" />
+                </el-form-item>
+                <el-form-item label="3月" prop="month3">
+                    <el-input v-model="formData.month3" clearable placeholder="请输入3月" />
+                </el-form-item>
+                <el-form-item label="4月" prop="month4">
+                    <el-input v-model="formData.month4" clearable placeholder="请输入4月" />
+                </el-form-item>
+                <el-form-item label="5月" prop="month5">
+                    <el-input v-model="formData.month5" clearable placeholder="请输入5月" />
+                </el-form-item>
+                <el-form-item label="6月" prop="month6">
+                    <el-input v-model="formData.month6" clearable placeholder="请输入6月" />
+                </el-form-item>
+                <el-form-item label="7月" prop="month7">
+                    <el-input v-model="formData.month7" clearable placeholder="请输入7月" />
+                </el-form-item>
+                <el-form-item label="8月" prop="month8">
+                    <el-input v-model="formData.month8" clearable placeholder="请输入8月" />
+                </el-form-item>
+                <el-form-item label="9月" prop="month9">
+                    <el-input v-model="formData.month9" clearable placeholder="请输入9月" />
+                </el-form-item>
+                <el-form-item label="10月" prop="month10">
+                    <el-input v-model="formData.month10" clearable placeholder="请输入10月" />
+                </el-form-item>
+                <el-form-item label="11月" prop="month11">
+                    <el-input v-model="formData.month11" clearable placeholder="请输入11月" />
+                </el-form-item>
+                <el-form-item label="12月" prop="month12">
+                    <el-input v-model="formData.month12" clearable placeholder="请输入12月" />
+                </el-form-item>
+            </el-form>
+        </popup>
+    </div>
+</template>
+
+<script lang="ts" setup name="costBudgetDetailEdit">
+import type { FormInstance } from 'element-plus'
+import Popup from '@/components/popup/index.vue'
+import { apiCostBudgetDetailAdd, apiCostBudgetDetailEdit, apiCostBudgetDetailDetail } from '@/api/cost_budget_detail'
+import { timeFormat } from '@/utils/util'
+import type { PropType } from 'vue'
+defineProps({
+    dictData: {
+        type: Object as PropType<Record<string, any[]>>,
+        default: () => ({})
+    }
+})
+const emit = defineEmits(['success', 'close'])
+const formRef = shallowRef<FormInstance>()
+const popupRef = shallowRef<InstanceType<typeof Popup>>()
+const mode = ref('add')
+
+
+// 弹窗标题
+const popupTitle = computed(() => {
+    return mode.value == 'edit' ? '编辑预算明细' : '新增预算明细'
+})
+
+// 表单数据
+const formData = reactive({
+    id: '',
+    cost_subject_id: '',
+    gc_cost_budget_id: '',
+    dept_id: '',
+    month1: '',
+    month2: '',
+    month3: '',
+    month4: '',
+    month5: '',
+    month6: '',
+    month7: '',
+    month8: '',
+    month9: '',
+    month10: '',
+    month11: '',
+    month12: '',
+})
+
+
+// 表单验证
+const formRules = reactive<any>({
+    cost_subject_id: [{
+        required: true,
+        message: '请输入一级科目id',
+        trigger: ['blur']
+    }],
+    gc_cost_budget_id: [{
+        required: true,
+        message: '请输入费用明细id',
+        trigger: ['blur']
+    }]
+})
+
+
+// 获取详情
+const setFormData = async (data: Record<any, any>) => {
+    for (const key in formData) {
+        if (data[key] != null && data[key] != undefined) {
+            //@ts-ignore
+            formData[key] = data[key]
+        }
+    }
+    
+    
+}
+
+const getDetail = async (row: Record<string, any>) => {
+    const data = await apiCostBudgetDetailDetail({
+        id: row.id
+    })
+    setFormData(data)
+}
+
+
+// 提交按钮
+const handleSubmit = async () => {
+    await formRef.value?.validate()
+    const data = { ...formData,  }
+    mode.value == 'edit' 
+        ? await apiCostBudgetDetailEdit(data) 
+        : await apiCostBudgetDetailAdd(data)
+    popupRef.value?.close()
+    emit('success')
+}
+
+//打开弹窗
+const open = (type = 'add') => {
+    mode.value = type
+    popupRef.value?.open()
+}
+
+// 关闭回调
+const handleClose = () => {
+    emit('close')
+}
+
+
+
+defineExpose({
+    open,
+    setFormData,
+    getDetail
+})
+</script>
diff --git a/src/views/cost_budget_detail/index.vue b/src/views/cost_budget_detail/index.vue
new file mode 100644
index 0000000..9ca77c1
--- /dev/null
+++ b/src/views/cost_budget_detail/index.vue
@@ -0,0 +1,167 @@
+<template>
+    <div>
+        <!-- <el-card class="!border-none mb-4" shadow="never">
+            <el-form
+                class="mb-[-16px]"
+                :model="queryParams"
+                inline
+            >
+                <el-form-item label="一级科目id" prop="cost_subject_id">
+                    <el-input class="w-[280px]" v-model="queryParams.cost_subject_id" clearable placeholder="请输入一级科目id" />
+                </el-form-item>
+                <el-form-item label="费用明细id" prop="gc_cost_budget_id">
+                    <el-input class="w-[280px]" v-model="queryParams.gc_cost_budget_id" clearable placeholder="请输入费用明细id" />
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" @click="resetPage">查询</el-button>
+                    <el-button @click="resetParams">重置</el-button>
+                </el-form-item>
+            </el-form>
+        </el-card> -->
+        <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+            <!-- <el-button v-perms="['cost.cost_budget_detail/add']" type="primary" @click="handleAdd">
+                <template #icon>
+                    <icon name="el-icon-Plus" />
+                </template>
+                新增
+            </el-button>
+            <el-button
+                v-perms="['cost.cost_budget_detail/delete']"
+                :disabled="!selectData.length"
+                @click="handleDelete(selectData)"
+            >
+                删除
+            </el-button> -->
+            <div class="mt-4">
+
+
+                <el-table :data="pager.lists" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" />
+                    <el-table-column label="ID" prop="id" show-overflow-tooltip />
+                    <el-table-column label="部门名称" prop="dept_name" show-overflow-tooltip />
+                    <el-table-column label="年份" prop="years" show-overflow-tooltip />
+                    <el-table-column label="科目编码" prop="sn" show-overflow-tooltip />
+                    <el-table-column label="一级科目" prop="subject1" show-overflow-tooltip />
+                    <el-table-column label="二级科目" prop="subject2" show-overflow-tooltip />
+
+                    <el-table-column label="1月合计" show-overflow-tooltip prop="month1" />
+                    <el-table-column label="1月已发生" show-overflow-tooltip />
+                    <el-table-column label="1月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="2月合计" show-overflow-tooltip prop="month2" />
+                    <el-table-column label="2月已发生" show-overflow-tooltip />
+                    <el-table-column label="2月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="3月合计" show-overflow-tooltip prop="month3" />
+                    <el-table-column label="3月已发生" show-overflow-tooltip />
+                    <el-table-column label="3月剩余" show-overflow-tooltip />
+
+
+
+
+                    <el-table-column label="4月合计" show-overflow-tooltip prop="month4" />
+                    <el-table-column label="4月已发生" show-overflow-tooltip />
+                    <el-table-column label="4月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="5月合计" show-overflow-tooltip prop="month5" />
+                    <el-table-column label="5月已发生" show-overflow-tooltip />
+                    <el-table-column label="5月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="6月合计" show-overflow-tooltip prop="month6" />
+                    <el-table-column label="6月已发生" show-overflow-tooltip />
+                    <el-table-column label="6月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="7月合计" show-overflow-tooltip prop="month7" />
+                    <el-table-column label="7月已发生" show-overflow-tooltip />
+                    <el-table-column label="7月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="8月合计" show-overflow-tooltip prop="month8" />
+                    <el-table-column label="8月已发生" show-overflow-tooltip />
+                    <el-table-column label="8月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="9月合计" show-overflow-tooltip prop="month9" />
+                    <el-table-column label="9月已发生" show-overflow-tooltip />
+                    <el-table-column label="9月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="10月合计" show-overflow-tooltip prop="month10" />
+                    <el-table-column label="10月已发生" show-overflow-tooltip />
+                    <el-table-column label="10月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="11月合计" show-overflow-tooltip prop="month11" />
+                    <el-table-column label="11月已发生" show-overflow-tooltip />
+                    <el-table-column label="11月剩余" show-overflow-tooltip />
+
+                    <el-table-column label="12月合计" show-overflow-tooltip prop="month12" />
+                    <el-table-column label="12月已发生" show-overflow-tooltip />
+                    <el-table-column label="12月剩余" show-overflow-tooltip />
+                </el-table>
+            </div>
+            <div class="flex mt-4 justify-end">
+                <pagination v-model="pager" @change="getLists" />
+            </div>
+        </el-card>
+        <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
+    </div>
+</template>
+
+<script lang="ts" setup name="costBudgetDetailLists">
+import { usePaging } from '@/hooks/usePaging'
+import { useDictData } from '@/hooks/useDictOptions'
+import { apiCostBudgetDetailLists, apiCostBudgetDetailDelete } from '@/api/cost_budget_detail'
+import { timeFormat } from '@/utils/util'
+import feedback from '@/utils/feedback'
+import EditPopup from './edit.vue'
+
+const editRef = shallowRef<InstanceType<typeof EditPopup>>()
+// 是否显示编辑框
+const showEdit = ref(false)
+
+
+// 查询条件
+const queryParams = reactive({
+    cost_subject_id: '',
+    gc_cost_budget_id: ''
+})
+
+// 选中数据
+const selectData = ref<any[]>([])
+
+// 表格选择后回调事件
+const handleSelectionChange = (val: any[]) => {
+    selectData.value = val.map(({ id }) => id)
+}
+
+// 获取字典数据
+const { dictData } = useDictData('')
+
+// 分页相关
+const { pager, getLists, resetParams, resetPage } = usePaging({
+    fetchFun: apiCostBudgetDetailLists,
+    params: queryParams
+})
+
+// 添加
+const handleAdd = async () => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('add')
+}
+
+// 编辑
+const handleEdit = async (data: any) => {
+    showEdit.value = true
+    await nextTick()
+    editRef.value?.open('edit')
+    editRef.value?.setFormData(data)
+}
+
+// 删除
+const handleDelete = async (id: number | any[]) => {
+    await feedback.confirm('确定要删除？')
+    await apiCostBudgetDetailDelete({ id })
+    getLists()
+}
+
+getLists()
+</script>
+
diff --git a/src/views/financialManagement/expense_reimbursement_detail/index.vue b/src/views/financialManagement/expense_reimbursement_detail/index.vue
index 497b33c..6bdf50c 100644
--- a/src/views/financialManagement/expense_reimbursement_detail/index.vue
+++ b/src/views/financialManagement/expense_reimbursement_detail/index.vue
@@ -9,7 +9,8 @@
                 <el-form-item label="费用科目id" prop="cost_subject_id">
                     <el-select class="w-[280px]" v-model="queryParams.cost_subject_id" clearable placeholder="请选择费用科目id">
 
-                        <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name" :value="item.value" />
+                        <el-option v-for="(item, index) in dictData.invoice_type" :key="index" :label="item.name"
+                            :value="item.value" />
                     </el-select>
                 </el-form-item>
                 <el-form-item>
@@ -65,8 +66,8 @@ import { reimbursementdetails } from '@/api/expense_reimbursement'
 import { timeFormat } from '@/utils/util'
 
 import feedback from '@/utils/feedback'
-import EditPopup from './edit.vue'
-import DetailPopup from './detail.vue'
+// import EditPopup from './edit.vue'
+// import DetailPopup from './detail.vue'
 const detailRef = shallowRef<InstanceType<typeof DetailPopup>>()
 const editRef = shallowRef<InstanceType<typeof EditPopup>>()
 // 是否显示编辑框
diff --git a/src/views/subcontracting_contract_detail/index.vue b/src/views/subcontracting_contract_detail/index.vue
index 57be32e..d20ef47 100644
--- a/src/views/subcontracting_contract_detail/index.vue
+++ b/src/views/subcontracting_contract_detail/index.vue
@@ -2,9 +2,9 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" inline>
-                <el-form-item label="部门id" prop="department_id">
+                <!-- <el-form-item label="部门id" prop="department_id">
                     <el-input class="w-[280px]" v-model="queryParams.department_id" clearable placeholder="请输入部门id" />
-                </el-form-item>
+                </el-form-item> -->
                 <el-form-item label="合同名称" prop="contract_name">
                     <el-input class="w-[280px]" v-model="queryParams.contract_name" clearable placeholder="请输入合同名称" />
                 </el-form-item>
@@ -15,7 +15,7 @@
             </el-form>
         </el-card>
         <el-card class="!border-none" v-loading="pager.loading" shadow="never">
-            <el-button v-perms="['contract.subcontracting_contract/add']" type="primary" @click="handleAdd">
+            <!-- <el-button v-perms="['contract.subcontracting_contract/add']" type="primary" @click="handleAdd">
                 <template #icon>
                     <icon name="el-icon-Plus" />
                 </template>
@@ -23,7 +23,7 @@
             </el-button>
             <el-button v-perms="['contract.subcontracting_contract/delete']" :disabled="!selectData.length" @click="handleDelete(selectData)">
                 删除
-            </el-button>
+            </el-button> -->
             <div class="mt-4">
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
@@ -33,22 +33,22 @@
                     <el-table-column label="项目编码" prop="project_name" show-overflow-tooltip />
 
 
-                    <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip />
+                    <!-- <el-table-column label="合同编号" prop="contract_no" show-overflow-tooltip /> -->
                     <el-table-column label="合同名称" prop="contract_name" show-overflow-tooltip />
-                    <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip />
+                    <!-- <el-table-column label="供应商名称" prop="supplier_name" show-overflow-tooltip /> -->
                     <el-table-column label="合同类型" prop="contract_type">
                         <template #default="{ row }">
                             <dict-value :options="dictData.contract_type" :value="row.contract_type" />
                         </template>
                     </el-table-column>
                     <el-table-column label="签订日期" prop="signing_date" show-overflow-tooltip />
-                    <el-table-column label="付款方式" prop="pay_type" show-overflow-tooltip />
+                    <!-- <el-table-column label="付款方式" prop="pay_type" show-overflow-tooltip />
                     <el-table-column label="账期" prop="account_period">
                         <template #default="{ row }">
                             <dict-value :options="dictData.account_period" :value="row.account_period" />
                         </template>
-                    </el-table-column>
-                    <el-table-column label="合同金额" prop="amount" show-overflow-tooltip />
+                    </el-table-column> -->
+                    <!-- <el-table-column label="合同金额" prop="amount" show-overflow-tooltip /> -->
                     <el-table-column label="工作类型" prop="amount_daxie" show-overflow-tooltip />
                     <el-table-column label="工作内容" prop="amount_daxie" show-overflow-tooltip />
                     <el-table-column label="项目特征" prop="amount_daxie" show-overflow-tooltip />
@@ -60,10 +60,11 @@
                     </el-table-column>
                     <el-table-column label="工作量" prop="amount_daxie" show-overflow-tooltip />
                     <el-table-column label="不含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
-                    <el-table-column label="含税单价" prop="amount_excluding_tax" show-overflow-tooltip />
-                    <el-table-column label="质保金比例" prop="retention_money" show-overflow-tooltip />
-                    <el-table-column label="质保金" prop="retention_money_rate" show-overflow-tooltip />
-                    <el-table-column label="操作" width="160" fixed="right">
+                    <el-table-column label="含税金额" prop="amount_excluding_tax" show-overflow-tooltip />
+                    <!-- <el-table-column label="质保金比例" prop="retention_money" show-overflow-tooltip />
+                    <el-table-column label="质保金" prop="retention_money_rate" show-overflow-tooltip /> -->
+                    <el-table-column label="备注" prop="remark" show-overflow-tooltip />
+                    <!-- <el-table-column label="操作" width="160" fixed="right">
                         <template #default="{ row }">
                             <el-button v-perms="['contract.subcontracting_contract/edit']" type="primary" link @click="handleEdit(row)">
                                 编辑
@@ -75,7 +76,7 @@
                                 详情
                             </el-button>
                         </template>
-                    </el-table-column>
+                    </el-table-column> -->
                 </el-table>
             </div>
             <div class="flex mt-4 justify-end">