From 739d42fe38ae430b6447b12ea4d0300a8d1daeaf Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sun, 21 Jan 2024 11:58:22 +0800
Subject: [PATCH 1/5] update

---
 src/views/bid_bidding_decision/index.vue | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/bid_bidding_decision/index.vue b/src/views/bid_bidding_decision/index.vue
index 6ac359c..47d35bd 100644
--- a/src/views/bid_bidding_decision/index.vue
+++ b/src/views/bid_bidding_decision/index.vue
@@ -2,8 +2,8 @@
     <div>
         <el-card class="!border-none mb-4" shadow="never">
             <el-form class="mb-[-16px]" :model="queryParams" label-width="auto" inline>
-                <el-form-item label="编码" prop="code">
-                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入编码" />
+                <el-form-item label="决策单号" prop="code">
+                    <el-input class="w-[280px]" v-model="queryParams.code" clearable placeholder="请输入决策单号" />
                 </el-form-item>
                 <el-form-item label="项目名称" prop="project_name">
                     <el-input class="w-[280px]" v-model="queryParams.project_name" clearable placeholder="请输入项目名称" />
@@ -11,7 +11,7 @@
                 <el-form-item label="客户名称" prop="custom_name">
                     <el-input class="w-[280px]" v-model="queryParams.custom_name" clearable placeholder="请输入客户名称" />
                 </el-form-item>
-                <el-form-item label="招标项目资金来源" prop="bidding_project_fund_source">
+                <el-form-item label="资金来源" prop="bidding_project_fund_source">
                     <el-select class="w-[280px]" v-model="queryParams.bidding_project_fund_source" clearable
                         placeholder="请选择类型">
                         <el-option v-for="(item, index) in dictData.construction_funds_sources" :key="index"
@@ -44,14 +44,11 @@
                 <el-table :data="pager.lists" @selection-change="handleSelectionChange">
                     <el-table-column type="selection" width="55" />
                     <el-table-column label="序号" type="index" width="55" />
-
-                    <el-table-column label="流程步骤" prop="project_id" show-overflow-tooltip />
-                    <el-table-column label="流程编号" prop="code" show-overflow-tooltip />
+                    <el-table-column label="决策单号" prop="code" show-overflow-tooltip />
                     <el-table-column label="客户名称" prop="custom_name" show-overflow-tooltip />
                     <el-table-column label="项目名称" prop="project_name" show-overflow-tooltip />
-                    <el-table-column label="项目估算(万元)" width="125" prop="project_estimation" show-overflow-tooltip />
-                    <el-table-column label="招标项目资金来源" width="155" prop="bidding_project_fund_source"
-                        show-overflow-tooltip />
+                    <el-table-column label="项目估算" width="125" prop="project_estimation" show-overflow-tooltip />
+                    <el-table-column label="资金来源" width="155" prop="bidding_project_fund_source" show-overflow-tooltip />
                     <el-table-column label="投标时间" prop="bidding_time" width="155" show-overflow-tooltip />
                     <!-- <el-table-column label="购买标书时间" width="155" prop="buy_bid_document_date" show-overflow-tooltip /> -->
                     <el-table-column label="招标方式" prop="bid_type" show-overflow-tooltip />

From f0daf15991b6a6820d88bfd5c82e3d8735e6da0d Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sun, 21 Jan 2024 14:48:36 +0800
Subject: [PATCH 2/5] update

---
 src/views/bid_bidding_decision/edit.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/bid_bidding_decision/edit.vue b/src/views/bid_bidding_decision/edit.vue
index 8b22d07..abe5b63 100644
--- a/src/views/bid_bidding_decision/edit.vue
+++ b/src/views/bid_bidding_decision/edit.vue
@@ -47,11 +47,6 @@
                             <el-date-picker v-model="formData.bidding_time" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                                 placeholder="请选择投标时间" clearable></el-date-picker>
                         </el-form-item></el-col><el-col :span="8">
-                        <el-form-item label="购买标书时间" prop="buy_bid_document_date">
-                            <!-- <el-input v-model="formData.buy_bid_document_date" clearable placeholder="请输入购买标书时间" /> -->
-                            <el-date-picker v-model="formData.buy_bid_document_date" format="YYYY-MM-DD"
-                                value-format="YYYY-MM-DD" placeholder="请输入购买标书时间" clearable></el-date-picker>
-                        </el-form-item></el-col><el-col :span="24">
                         <el-form-item label="招标方式" prop="bid_type">
                             <el-radio-group v-model="formData.bid_type" placeholder="请选择招标方式">
                                 <el-radio v-for="(item, index) in dictData.bidding_method" :key="index"
@@ -63,7 +58,7 @@
                         <el-form-item label="竞争对手" prop="competitor">
                             <el-input v-model="formData.competitor" clearable placeholder="请输入竞争对手" />
                         </el-form-item></el-col><el-col :span="24">
-                        <el-form-item label="是否需要保证金" prop="is_margin">
+                        <el-form-item label="是否需要保证金" prop="is_margin" :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
                             <el-radio-group v-model="formData.is_margin" placeholder="请选择是否需要保证金">
                                 <el-radio v-for="(item, index) in dictData.whether_status" :key="index"
                                     :label="parseInt(item.value)">

From 9fdf7833206f927eab8b492d211d6d8998fd1ce5 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sun, 21 Jan 2024 15:14:28 +0800
Subject: [PATCH 3/5] update

---
 src/views/bid_bidding_decision/edit.vue     | 44 ---------------------
 src/views/bid_buy_bidding_document/edit.vue | 41 -------------------
 2 files changed, 85 deletions(-)

diff --git a/src/views/bid_bidding_decision/edit.vue b/src/views/bid_bidding_decision/edit.vue
index abe5b63..495bff0 100644
--- a/src/views/bid_bidding_decision/edit.vue
+++ b/src/views/bid_bidding_decision/edit.vue
@@ -2,16 +2,6 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
-
-                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
-                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
-                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                </div>
-
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="project_id"
@@ -165,8 +155,6 @@ const mode = ref('add')
 const showDialog = ref(false)
 const list1 = reactive([])
 const list2 = reactive([])
-import { deptAll } from '@/api/org/department'
-import { getAll } from '@/api/org/organization'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
 import useUserStore from "@/stores/modules/user";
@@ -205,39 +193,10 @@ const customEvent = (e: any) => {
 const popupTitle = computed(() => {
     return mode.value == 'edit' ? '编辑投标决策' : '新增投标决策'
 })
-//获取所有组织
-const getlist = () => {
-    getAll().then((res) => {
-        Object.assign(list1, res)
-        if (res.length > 0 && !formData.org_id) {
-            formData.org_id = res[0].id
-            deptAll({ 'org_id': res[0].id }).then((res) => {
-                if (res.length > 0) {
-                    Object.assign(list2, res)
-                    formData.dept_id = res[0].id
-                }
 
-            })
-        }
-    })
-}
-//获取部门
-const deptrmt = (e: any) => {
-    formData.dept_id = ''
-    getlist1(e)
-
-}
-//获取所有部门
-const getlist1 = (id: any) => {
-    deptAll({ 'org_id': id }).then((res) => {
-        Object.assign(list2, res)
-    })
-}
 // 表单数据
 const formData = reactive({
     id: '',
-    dept_id: '',
-    org_id: '',
     project_id: '',
     project_estimation: '',
     bidding_project_fund_source: '',
@@ -280,9 +239,6 @@ const setFormData = async (data: Record<any, any>) => {
         Object.assign(formDataannex, arry1)
 
     }
-    if (data.dept_id) {
-        getlist1(data.org_id)
-    }
     for (const key in formData) {
         if (data[key] != null && data[key] != undefined) {
             //@ts-ignore
diff --git a/src/views/bid_buy_bidding_document/edit.vue b/src/views/bid_buy_bidding_document/edit.vue
index a16d745..b435ee6 100644
--- a/src/views/bid_buy_bidding_document/edit.vue
+++ b/src/views/bid_buy_bidding_document/edit.vue
@@ -2,15 +2,6 @@
     <div class="edit-popup">
         <popup ref="popupRef" :title="popupTitle" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-form ref="formRef" :model="formData" label-width="auto" :rules="formRules" inline>
-                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
-
-                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
-                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
-                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                </div>
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="项目名称" prop="project_id"
@@ -163,8 +154,6 @@ const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
 const list1 = reactive([])
 const list2 = reactive([])
-import { deptAll } from '@/api/org/department'
-import { getAll } from '@/api/org/organization'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
 import useUserStore from "@/stores/modules/user";
@@ -178,8 +167,6 @@ const popupTitle = computed(() => {
 
 // 表单数据
 const formData = reactive({
-    "org_id": 0,
-    "dept_id": 0,
     "project_id": 0,
     "bid_decision_id": 0,
     bid_decision_code: "",
@@ -208,34 +195,6 @@ const submituser = (e: any) => {
 const formRules = reactive<any>({
 
 })
-//获取所有组织
-const getlist = () => {
-    getAll().then((res) => {
-        Object.assign(list1, res)
-        if (res.length > 0 && !formData.org_id) {
-            formData.org_id = res[0].id
-            deptAll({ 'org_id': res[0].id }).then((res) => {
-                if (res.length > 0) {
-                    Object.assign(list2, res)
-                    formData.dept_id = res[0].id
-                }
-
-            })
-        }
-    })
-}
-//获取部门
-const deptrmt = (e: any) => {
-    formData.dept_id = ''
-    getlist1(e)
-
-}
-//获取所有部门
-const getlist1 = (id: any) => {
-    deptAll({ 'org_id': id }).then((res) => {
-        list2.splice(0, list2.length, ...res)
-    })
-}
 //获取值
 const customEvent = (e: any) => {
     formData.project_id = e.project_id;

From aa7896e19be031e2cfdc9501cfde0593daba65ad Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sun, 21 Jan 2024 15:19:49 +0800
Subject: [PATCH 4/5] update

---
 src/views/bid_document_examination/edit.vue | 42 ---------------------
 1 file changed, 42 deletions(-)

diff --git a/src/views/bid_document_examination/edit.vue b/src/views/bid_document_examination/edit.vue
index 3408c34..1828f39 100644
--- a/src/views/bid_document_examination/edit.vue
+++ b/src/views/bid_document_examination/edit.vue
@@ -10,15 +10,6 @@
                     <el-step title="事业部总经理审批" />
                     <el-step title="销售副总" />
                 </el-steps>
-                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
-
-                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
-                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
-                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                </div>
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="标书编号" prop="buy_bidding_document_id" @click="showDialog = true"
@@ -332,8 +323,6 @@ const bid_address = ref('')
 const tableData = ref([{}])
 const list1 = reactive([])
 const list2 = reactive([])
-import { deptAll } from '@/api/org/department'
-import { getAll } from '@/api/org/organization'
 import configs from "@/config"
 const base_url = configs.baseUrl + configs.urlPrefix
 import useUserStore from "@/stores/modules/user";
@@ -446,8 +435,6 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    dept_id: '',
-    org_id: '',
     approve_id: 0,
     buy_bidding_document_id: '',
 
@@ -505,35 +492,6 @@ const customEvent1 = (e: any) => {
 const formRules = reactive<any>({
 
 })
-
-//获取所有组织
-const getlist = () => {
-    getAll().then((res) => {
-        Object.assign(list1, res)
-        if (res.length > 0 && !formData.org_id) {
-            formData.org_id = res[0].id
-            deptAll({ 'org_id': res[0].id }).then((res) => {
-                if (res.length > 0) {
-                    Object.assign(list2, res)
-                    formData.dept_id = res[0].id
-                }
-
-            })
-        }
-    })
-}
-//获取部门
-const deptrmt = (e: any) => {
-    formData.dept_id = ''
-    getlist1(e)
-
-}
-//获取所有部门
-const getlist1 = (id: any) => {
-    deptAll({ 'org_id': id }).then((res) => {
-        list2.splice(0, list2.length, ...res)
-    })
-}
 // 获取详情
 const setFormData = async (data: Record<any, any>) => {
 

From 6fdd4c1093f92fe339ff489bc8ca26e00cdfcfdc Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Sun, 21 Jan 2024 15:24:17 +0800
Subject: [PATCH 5/5] update

---
 src/views/bid_result/detail.vue |  2 --
 src/views/bid_result/edit.vue   | 41 ---------------------------------
 2 files changed, 43 deletions(-)

diff --git a/src/views/bid_result/detail.vue b/src/views/bid_result/detail.vue
index aab38ce..1988abe 100644
--- a/src/views/bid_result/detail.vue
+++ b/src/views/bid_result/detail.vue
@@ -5,8 +5,6 @@
     <div class="detail-popup">
         <popup ref="popupRef" title="投标结果详情" :async="true" width="80%" @confirm="handleSubmit" @close="handleClose">
             <el-descriptions :column="3" border>
-                <el-descriptions-item label="组织名称" label-align="left" align="left" label-class-name="my-label">{{ formData.org_name }}</el-descriptions-item>
-                <el-descriptions-item label="部门名称" label-align="left" align="left" label-class-name="my-label">{{ formData.dept_name }}</el-descriptions-item>
                 <el-descriptions-item label="投标编号" label-align="left" align="left" label-class-name="my-label">{{ formData.bid_document_examination_code }}</el-descriptions-item>
                 <el-descriptions-item label="客户名称" label-align="left" align="left" label-class-name="my-label">{{ formData.custom_name }}</el-descriptions-item>
                 <el-descriptions-item label="项目名称" label-align="left" align="left" label-class-name="my-label">{{ formData.project_name }}</el-descriptions-item>
diff --git a/src/views/bid_result/edit.vue b/src/views/bid_result/edit.vue
index 9eba514..e7079f2 100644
--- a/src/views/bid_result/edit.vue
+++ b/src/views/bid_result/edit.vue
@@ -4,15 +4,6 @@
 
 
             <el-form ref="formRef" :model="formData" label-width="120px" :rules="formRules">
-                <div style="display: flex; flex-direction: row-reverse; justify-content: flex-start;margin-bottom: 30px;">
-
-                    <el-select class="w-[180px]" v-model="formData.dept_id" clearable placeholder="请选择部门">
-                        <el-option v-for="(item, index) in list2" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                    <el-select class="w-[180px]" v-model="formData.org_id" clearable placeholder="请选择组织" @change="deptrmt">
-                        <el-option v-for="(item, index) in list1" :key="index" :label="item.name" :value="item.id" />
-                    </el-select>
-                </div>
                 <el-form-item label="标书审查编码" prop="bid_document_examination_id" @click="showDialog = true">
                     <el-input v-model="bid_document_no" clearable placeholder="点击选择标书评审(可以为空)" />
                 </el-form-item>
@@ -105,8 +96,6 @@ const formDataannex = reactive([])
 const showDialog = ref(false)
 const list1 = reactive([])
 const list2 = reactive([])
-import { deptAll } from '@/api/org/department'
-import { getAll } from '@/api/org/organization'
 // 上传文件
 const handleAvatarSuccess_four = (
     response,
@@ -135,8 +124,6 @@ const popupTitle = computed(() => {
 // 表单数据
 const formData = reactive({
     id: '',
-    org_id: '',
-    dept_id: '',
     bid_document_examination_id: '',
     project_id: '',
     is_successful: '',
@@ -146,34 +133,6 @@ const formData = reactive({
     annex: [],
 })
 
-//获取所有组织
-const getlist = () => {
-    getAll().then((res) => {
-        Object.assign(list1, res)
-        if (res.length > 0 && !formData.org_id) {
-            formData.org_id = res[0].id
-            deptAll({ 'org_id': res[0].id }).then((res) => {
-                if (res.length > 0) {
-                    Object.assign(list2, res)
-                    formData.dept_id = res[0].id
-                }
-
-            })
-        }
-    })
-}
-//获取部门
-const deptrmt = (e: any) => {
-    formData.dept_id = ''
-    getlist1(e)
-
-}
-//获取所有部门
-const getlist1 = (id: any) => {
-    deptAll({ 'org_id': id }).then((res) => {
-        list2.splice(0, list2.length, ...res)
-    })
-}
 // 表单验证
 const formRules = reactive<any>({