From 6d9813e77e4534a4017dc6747ecad241052992e8 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Wed, 3 Apr 2024 17:48:07 +0800
Subject: [PATCH] add

---
 src/components/personnelselector/index.vue   |   1 -
 src/components/personnelselector/index1.vue  | 366 +++++++++++++++++++
 src/views/InvoicingRequests/index.vue        |   2 +-
 src/views/material_purchase_request/edit.vue |  15 +-
 src/views/procurement_contract/edit.vue      |   2 +-
 src/views/project_total_budget/edit.vue      |   8 +-
 src/views/remittance/edit.vue                |   2 +-
 src/views/supplier_contacts/edit.vue         |   8 +-
 vite.config.ts                               |   2 +-
 9 files changed, 391 insertions(+), 15 deletions(-)
 create mode 100644 src/components/personnelselector/index1.vue

diff --git a/src/components/personnelselector/index.vue b/src/components/personnelselector/index.vue
index 2b8a994..a669479 100644
--- a/src/components/personnelselector/index.vue
+++ b/src/components/personnelselector/index.vue
@@ -199,7 +199,6 @@
 <script lang="ts" setup name="projectPreSalesMembersEdit">
 import { reactive } from 'vue'
 import { getAdminsByAll, getAllDept, getAllJobs, getAdminsByDept, getAdminsByJob } from '@/api/common'
-import type { PropType } from 'vue'
 import { defineEmits } from "vue"
 const leixin = ref('0')
 const props = defineProps({
diff --git a/src/components/personnelselector/index1.vue b/src/components/personnelselector/index1.vue
new file mode 100644
index 0000000..db9acf0
--- /dev/null
+++ b/src/components/personnelselector/index1.vue
@@ -0,0 +1,366 @@
+<template>
+    <div class="edit-popup">
+        <el-dialog v-model="dialogVisible" title="人员选择器" width="600px" :before-close="handleClose">
+            <div>
+                <el-radio-group v-model="isCollapse" style="margin-bottom: 20px">
+                    <el-radio-button :label="1">全部人员</el-radio-button>
+                    <el-radio-button :label="2">按部门筛选</el-radio-button>
+                    <el-radio-button :label="3">按岗位筛选</el-radio-button>
+                    <el-button class="ml-[200px]" v-show="isCollapse != 1 && (!isshow || !isshow1)"
+                        @click="(isshow = true), (isshow1 = true)">返回</el-button>
+                </el-radio-group>
+                <div v-if="type == 1">
+                    <div v-if="isCollapse == 1" style="margin-bottom: 20px">
+                        <div style="margin-top: 20px">
+                            <el-radio-group v-model="radionum">
+                                <el-radio :label="item" v-for="(item, i) in uesrlist" :key="i" style="margin-bottom: 40px;">
+                                    <div class="radio-con">
+                                        <div class="radioa">
+                                            <img :src="item.avatar" alt="" />
+                                        </div>
+                                        <div class="radiob">
+                                            <div class="radiob_a">{{ item.name }}</div>
+                                            <div class="radiob_b">
+                                                <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
+                                                <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
+                                                <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                </el-radio><br />
+                            </el-radio-group>
+                        </div>
+                    </div>
+                    <div v-if="isCollapse == 2">
+                        <!-- 返回上一级别 -->
+                        <div v-if="isshow">
+                            <div class="lad" v-for="(item, i) in deparmetlist" :key="i">
+                                <div class="lad">{{ i }}</div>
+                                <div class="flex " v-for="(items, k) in item" style="justify-content: space-between;"
+                                    @click="deparmetclck(items)">
+                                    <div>{{ items.name }}</div>
+                                    <div class="Collapsebj">{{ items.admin_num }}</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div v-else>
+                            <el-radio-group v-model="radionum">
+                                <el-radio :label="item" v-for="(item, i) in deparmetlist1" :key="i"
+                                    style="margin-bottom: 20px;">
+                                    <div class="radio-con">
+                                        <div class="radioa">
+                                            <img :src="item.avatar" alt="" />
+                                        </div>
+                                        <div class="radiob">
+                                            <div class="radiob_a">{{ item.name }}</div>
+                                            <div class="radiob_b">
+                                                <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
+                                                <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
+                                                <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </el-radio><br />
+                            </el-radio-group>
+                        </div>
+                    </div>
+                    <div v-if="isCollapse == 3">
+                        <div class="lad " v-if="isshow1">
+                            <div class="flex " v-for="(item, j) in jobslist" :key="j"
+                                style="justify-content: space-between;" @click="gwclck(item)">
+                                <div>{{ item.name }}</div>
+                                <div class="Collapsebj">{{ item.admin_num }}</div>
+                            </div>
+                        </div>
+                        <div v-else>
+                            <el-radio-group v-model="radionum">
+                                <el-radio :label="item" v-for="(item, i) in jobslist1" :key="i"
+                                    style="margin-bottom: 20px;">
+                                    <div class="radio-con">
+                                        <div class="radioa">
+                                            <img :src="item.avatar" alt="" />
+                                        </div>
+                                        <div class="radiob">
+                                            <div class="radiob_a">{{ item.name }}</div>
+                                            <div class="radiob_b">
+                                                <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
+                                                <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
+                                                <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                </el-radio><br />
+                            </el-radio-group>
+                        </div>
+                    </div>
+
+                </div>
+                <div v-else>
+                    <div v-if="isCollapse == 1" style="margin-bottom: 20px">
+                        <div style="margin-top: 20px">
+                            <el-checkbox-group v-model="radiolist">
+                                <el-checkbox :label="item" v-for="(item, i) in uesrlist" :key="i"
+                                    style="margin-bottom: 20px;">
+                                    <div class="radio-con">
+                                        <div class="radioa">
+                                            <img :src="item.avatar" alt="" />
+                                        </div>
+                                        <div class="radiob">
+                                            <div class="radiob_a">{{ item.name }}</div>
+                                            <div class="radiob_b">
+                                                <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
+                                                <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
+                                                <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </el-checkbox><br />
+                            </el-checkbox-group>
+                        </div>
+                    </div>
+                    <div v-if="isCollapse == 2">
+                        <div v-if="isshow">
+                            <div class="lad" v-for="(item, i) in deparmetlist" :key="i">
+                                <div class="lad">{{ i }}</div>
+                                <div class="flex " v-for="(items, k) in item" style="justify-content: space-between;"
+                                    @click="deparmetclck(items)">
+                                    <div>{{ items.name }}</div>
+                                    <div class="Collapsebj">{{ items.admin_num }}</div>
+                                </div>
+                            </div>
+                        </div>
+                        <div v-else>
+                            <el-checkbox-group v-model="radiolist">
+                                <el-checkbox :label="item" v-for="(item, i) in deparmetlist1" :key="i"
+                                    style="margin-bottom: 20px;">
+                                    <div class="radio-con">
+                                        <div class="radioa">
+                                            <img :src="item.avatar" alt="" />
+                                        </div>
+                                        <div class="radiob">
+                                            <div class="radiob_a">{{ item.name }}</div>
+                                            <div class="radiob_b">
+                                                <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
+                                                <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
+                                                <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </el-checkbox><br />
+                            </el-checkbox-group>
+                        </div>
+                    </div>
+                    <div v-if="isCollapse == 3">
+                        <div class="lad " v-if="isshow1">
+                            <div class="flex " v-for="(item, j) in jobslist" :key="j"
+                                style="justify-content: space-between;" @click="gwclck(item)">
+                                <div>{{ item.name }}</div>
+                                <div class="Collapsebj">{{ item.admin_num }}</div>
+                            </div>
+                        </div>
+                        <div v-else>
+                            <el-checkbox-group v-model="radiolist">
+                                <el-checkbox :label="item" v-for="(item, i) in jobslist1" :key="i"
+                                    style="margin-bottom: 20px;">
+                                    <div class="radio-con">
+                                        <div class="radioa">
+                                            <img :src="item.avatar" alt="" />
+                                        </div>
+                                        <div class="radiob">
+                                            <div class="radiob_a">{{ item.name }}</div>
+                                            <div class="radiob_b">
+                                                <text v-if="item.org_name.length > 0">{{ item.org_name }}</text>
+                                                <text v-if="item.dept_name.length > 0">/{{ item.dept_name }}</text>
+                                                <text v-if="item.job_name.length > 0">/{{ item.job_name }}</text>
+
+                                            </div>
+                                        </div>
+                                    </div>
+                                </el-checkbox><br />
+                            </el-checkbox-group>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <template #footer>
+                <span class="dialog-footer">
+                    <el-button @click="dialogVisible = false">取消</el-button>
+                    <el-button type="primary" @click="userclick" v-if="type == 1">确认</el-button>
+                    <el-button type="primary" @click="userclick" v-else> {{ radiolist.length > 0 ? '已选' : '未选' }}
+                        <text v-if="radiolist.length > 0">{{ radiolist.length }}</text></el-button>
+                </span>
+            </template>
+        </el-dialog>
+    </div>
+</template>
+
+<script lang="ts" setup name="projectPreSalesMembersEdit">
+import { reactive } from 'vue'
+import { getAdminsByAll, getAllDept, getAllJobs, getAdminsByDept, getAdminsByJob } from '@/api/common'
+import { defineEmits } from "vue"
+const leixin = ref('0')
+const props = defineProps({
+    type: {
+        type: String || Number,//1:单选 2.多选
+        default: 1
+    }
+})
+const emits = defineEmits(['confirm'])
+
+const dialogVisible = ref(false)
+const isCollapse = ref(1);
+const uesrlist = reactive([])
+const deparmetlist = reactive({})
+const deparmetlist1 = reactive([])
+const jobslist = reactive({})
+const jobslist1 = reactive([])
+const isshow = ref(true);
+const isshow1 = ref(true);
+const radiolist = ref([])
+const radionum = ref([])
+
+// 获取全部人员
+const getlist = () => {
+    getAdminsByAll().then((res) => {
+        Object.assign(uesrlist, res)
+    })
+}
+
+//获取所有部门
+const deparmet = () => {
+    getAllDept().then((res) => {
+        Object.assign(deparmetlist, res)
+    })
+}
+//获取部门下的人员
+const deparmetclck = (item: { id: any }) => {
+    getAdminsByDept({ 'dept_id': item.id }).then((res) => {
+        if (res.length > 0) {
+            Object.assign(deparmetlist1, res)
+            isshow.value = false
+        }
+
+    })
+}
+
+//获取岗位
+
+const Jobs = () => {
+    getAllJobs().then((res) => {
+        Object.assign(jobslist, res)
+    })
+}
+
+//获取岗位下的人员
+const gwclck = (item: { id: any }) => {
+
+    getAdminsByJob({ 'job_id': item.id }).then((res) => {
+        if (res.length > 0) {
+            Object.assign(jobslist1, res)
+            isshow1.value = false
+        }
+
+    })
+}
+
+
+//打开弹窗
+const open = (e: any) => {
+    getlist()
+    deparmet()
+    Jobs()
+    leixin.value = e
+    dialogVisible.value = true
+
+}
+//获取选择的数据
+const userclick = () => {
+    dialogVisible.value = false
+    if (props.type == 1) {
+        emits("confirm", radionum.value);
+    } else {
+        emits("confirm", radiolist.value);
+    }
+
+}
+
+defineExpose({
+    open,
+    userclick
+})
+
+</script>
+
+<style lang="scss">
+.userlist {
+    display: flex;
+
+    img {
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+    }
+
+    text-align: center;
+
+    .userlist-con {
+        margin-right: 10px;
+    }
+}
+
+.user {
+    img {
+        width: 40px;
+        height: 40px;
+        border-radius: 50%;
+    }
+}
+
+.radio-con {
+    display: flex;
+    width: 500px;
+    align-items: center;
+
+    .radioa {
+        img {
+            margin-right: 20px;
+            width: 40px;
+            height: 40px;
+            border-radius: 50%;
+        }
+    }
+
+    .radiob {
+        .radiob_a {
+            margin-bottom: 10px;
+            margin-top: 3px;
+
+        }
+
+        .radiob_b {}
+
+    }
+}
+
+.lad {
+    padding: 10px 0;
+    border-bottom: 1px solid #f7f7f7;
+
+    div {
+        margin: 10px 0;
+    }
+
+    .Collapsebj {
+        background-color: #3e8ef7;
+        height: 20px;
+        width: 20px;
+        line-height: 20px;
+        text-align: center;
+        border-radius: 6px;
+        color: #f7f7f7;
+
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/InvoicingRequests/index.vue b/src/views/InvoicingRequests/index.vue
index a7a7584..05e562f 100644
--- a/src/views/InvoicingRequests/index.vue
+++ b/src/views/InvoicingRequests/index.vue
@@ -76,7 +76,7 @@
             </div>
         </el-card>
         <edit-popup v-if="showEdit" ref="editRef" :dict-data="dictData" @success="getLists" @close="showEdit = false" />
-        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" :column="2" />
+        <detailPage v-if="showDetail" ref="detailRef" @close="showEdit = false" :detailConfig="detailConfig" :column="3" />
     </div>
 </template>
 
diff --git a/src/views/material_purchase_request/edit.vue b/src/views/material_purchase_request/edit.vue
index 32f8f41..e838885 100644
--- a/src/views/material_purchase_request/edit.vue
+++ b/src/views/material_purchase_request/edit.vue
@@ -36,8 +36,10 @@
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="申请日期" prop="apply_date"
-                            :rules="[{ required: true, message: '不可为空', trigger: 'change' }]">
+                        <el-form-item label="申请日期" prop="apply_date" :rules="[{ required: true, message: '不可为空', trigger: 'change' }, {
+                            validator: chekcDate,
+                            trigger: ['blur']
+                        }]">
 
                             <el-date-picker class="flex-1 !flex" v-model="formData.apply_date" clearable type="date"
                                 value-format="YYYY-MM-DD" placeholder="选择申请日期">
@@ -260,6 +262,15 @@ const formData = reactive({
     purchase_request_detail: [],
 })
 
+
+const chekcDate = (rule: any, value: any, callback: any) => {
+    if (new Date(formData.apply_date) < new Date(formData.arrival_date)) {
+        callback(new Error('申请日期不能早于希望到货日期'))
+    } else {
+        callback()
+    }
+}
+
 // 表单验证
 const formRules = reactive<any>({
 
diff --git a/src/views/procurement_contract/edit.vue b/src/views/procurement_contract/edit.vue
index 3b6dd09..28d9aef 100644
--- a/src/views/procurement_contract/edit.vue
+++ b/src/views/procurement_contract/edit.vue
@@ -1,7 +1,7 @@
 <template>
     <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">
+            <el-form ref="formRef" :model="formData" label-width="130px" :rules="formRules">
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="供应商名称" prop="supplier_id" @click="showDialog1 = true"
diff --git a/src/views/project_total_budget/edit.vue b/src/views/project_total_budget/edit.vue
index 971e41a..8b340e6 100644
--- a/src/views/project_total_budget/edit.vue
+++ b/src/views/project_total_budget/edit.vue
@@ -320,7 +320,7 @@ const handleClose = () => {
 
 //获取项目总利润
 const totalAmout = computed(() => {
-    return Number(formData.cl_cost) + Number(formData.fb_cost) + Number(formData.rg_cost) + Number(formData.fy_cost) + Number(formData.jj_cost) || 0
+    return Number(formData.contract_amount) - (Number(formData.cl_cost) + Number(formData.fb_cost) + Number(formData.rg_cost) + Number(formData.fy_cost) + Number(formData.jj_cost) || 0)
 
 })
 
@@ -328,14 +328,14 @@ const totalAmout = computed(() => {
 // 计算每行的成本占比
 const calColumnRate = (index) => {
     tableData.forEach((item, index) => {
-        item.rate = Number(formData[item.value] / totalAmout.value).toFixed(2) || "0.00%"
+        item.rate = Number(formData[item.value] / (Number(formData.contract_amount) - totalAmout.value)).toFixed(2) || "0.00%"
     });
 
 }
 // 计算项目利润率
 const project_rate = computed(() => {
-    let num = ((totalAmout.value / Number(formData.contract_amount)).toFixed(2))
-    return (isNaN(num) ? '0.00%' : num)
+    let num = ((totalAmout.value / Number(formData.contract_amount)).toFixed(2)) * 100 + "%"
+    return num
 })
 
 // 表尾合计
diff --git a/src/views/remittance/edit.vue b/src/views/remittance/edit.vue
index a16edc2..9a49766 100644
--- a/src/views/remittance/edit.vue
+++ b/src/views/remittance/edit.vue
@@ -60,7 +60,7 @@
                             </el-radio-group>
                         </el-form-item>
                     </el-col> -->
-                    <el-col :span="12">
+                    <el-col :span="8">
                         <el-form-item label="回款责任人" prop="return_duty_id" @click="userclick">
                             <el-input v-model="return_name" readonly clearable placeholder="请输入回款责任人" />
                         </el-form-item>
diff --git a/src/views/supplier_contacts/edit.vue b/src/views/supplier_contacts/edit.vue
index 57e3ea4..da2d348 100644
--- a/src/views/supplier_contacts/edit.vue
+++ b/src/views/supplier_contacts/edit.vue
@@ -73,11 +73,11 @@
 
 
                     <el-col :span="8">
-                        <el-form-item label="工作电话" prop="work_phone" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
+                        <el-form-item label="工作电话" prop="work_phone">
                             <el-input v-model="formData.work_phone" clearable placeholder="请输入工作电话" />
                         </el-form-item></el-col>
                     <el-col :span="8">
-                        <el-form-item label="移动电话" prop="mobile">
+                        <el-form-item label="移动电话" prop="mobile" :rules="[{ validator: checkPhone, trigger: 'blur' }]">
                             <el-input v-model="formData.mobile" clearable placeholder="请输入移动电话" />
                         </el-form-item></el-col>
 
@@ -93,7 +93,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="邮编" prop="zip_code">
-                            <el-input v-model="formData.zip_code" clearable placeholder="请输入邮编" />
+                            <el-input v-model="formData.zip_code" clearable placeholder="请输入邮编" type="number" />
                         </el-form-item></el-col>
 
                     <el-col :span="8">
@@ -113,7 +113,7 @@
 
                     <el-col :span="8">
                         <el-form-item label="证件号码" prop="idcard" :rules="[{ validator: IDcard, trigger: 'blur' }]">
-                            <el-input v-model="formData.idcard" clearable placeholder="请输入证件号码" />
+                            <el-input v-model="formData.idcard" clearable placeholder="请输入证件号码" type="number" />
                         </el-form-item></el-col>
                     <el-col :span="8">
                         <el-form-item label="备注" prop="remark">
diff --git a/vite.config.ts b/vite.config.ts
index a73e6d3..132e422 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -19,7 +19,7 @@ export default defineConfig({
   base: "/admin/",
   server: {
     host: "0.0.0.0",
-    port: 9000,
+    port: 8081,
     open: true,
   },
   plugins: [