From 47ec55c54ed241d9e506c7cdad0cbb70965e5436 Mon Sep 17 00:00:00 2001
From: qiuhongwu <Qhw0227@163.com>
Date: Wed, 11 Oct 2023 12:29:01 +0800
Subject: [PATCH] =?UTF-8?q?users=E5=86=85=E5=AE=B9=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/users/configuration/index.vue   | 100 ++++++++++-------
 yunxi-ui-admin-vben/src/views/users/mine.rar  | Bin 5661 -> 0 bytes
 .../src/views/users/mine/index.vue            |  14 +--
 .../src/views/users/newNustomer/index.vue     | 103 ++++++++++++++----
 4 files changed, 149 insertions(+), 68 deletions(-)
 delete mode 100644 yunxi-ui-admin-vben/src/views/users/mine.rar

diff --git a/yunxi-ui-admin-vben/src/views/users/configuration/index.vue b/yunxi-ui-admin-vben/src/views/users/configuration/index.vue
index 7ef6a5bc..d6a5e145 100644
--- a/yunxi-ui-admin-vben/src/views/users/configuration/index.vue
+++ b/yunxi-ui-admin-vben/src/views/users/configuration/index.vue
@@ -1,19 +1,27 @@
 <script lang="ts" setup>
-import type { UnwrapRef, VueElement } from 'vue'
-import { onMounted, reactive, ref, watch  } from 'vue'
-import { RedoOutlined, SearchOutlined, UserOutlined } from '@ant-design/icons-vue'
-import type { FormProps, ItemType, MenuProps, SelectProps, TableColumnsType  } from 'ant-design-vue'
-
+import type { UnwrapRef, VueElement, nextTick } from 'vue'
+import { createVNode, getCurrentInstance, h, onMounted, reactive, ref, watch } from 'vue'
+import { ExclamationCircleOutlined, RedoOutlined, SearchOutlined, UserOutlined } from '@ant-design/icons-vue'
+import type { FormProps, ItemType, MenuProps, SelectProps, TableColumnsType } from 'ant-design-vue'
 import type { Dayjs } from 'dayjs'
+import { Modal, PlusOutlined } from 'ant-design-vue'
 
+// 创建this
+// const { proxy }: any = getCurrentInstance
 //当前选中的菜单项 key 数组
 const selectedKeys = ref<string[]>(['1'])
 
 //默认展开
 const navopenKeys = ref<string[]>(['sub1'])
 
+const title = ref<any>({
+  label:'',
+  key: '',
+})
+
+const items: any = reactive<ItemType[]>([
 
-const items: any = reactive<ItemType[]>([])
+])
 function getItem(
   label: VueElement | string,
   key: string,
@@ -70,10 +78,14 @@ async function fetchMenuItems() {
 async function fetchData() {
   try {
     const data = await fetchMenuItems()
+    console.log(data)
+    
     // 使用响应式数据保存获取到的菜单项
     // items变量通过reactive函数创建为响应式数据。在fetchData函数中，使用splice方法来替换items数组的内容，确保新的数据被响应式地更新。这样，当fetchData异步请求完成后，items数组中的数据将被更新为获取到的菜单项数据
     items.splice(0, items.length, ...data.map(item => getItem(item.label, item.key, null, item.children)))
-    // items.value = data.map(item => getItem(item.label, item.key, null, item.children))
+
+    title.value.label = data[0].children[0].label
+    
   }
   catch (error) {
     console.error('Error fetching menu items:', error)
@@ -367,36 +379,41 @@ const dataSource: any = [
   },
 ]
 
-// //被选中时调
-// function myFunction({ item, key, selectedKeys }) {
-//   // 在这里可以使用 item、key 和 selectedKeys
-//   console.log(item)
-//   console.log(key)
-//   console.log(selectedKeys)
-// }
-
-// // 调用函数时传递一个包含 item、key 和 selectedKeys 属性的对象
-// const data = {
-//   item: '仓库名称',
-//   key: 'someKey',
-//   selectedKeys: ['key1', 'key2'],
-// }
-
-// myFunction(data)
+//删除
+const [modal, contextHolder] = Modal.useModal()
+function showDeleteConfirm() {
+  modal.confirm({
+    title: '操作确认',
+    icon: h(ExclamationCircleOutlined),
+    content: '确认删除嘛',
+    okText: '确认',
+    okType: 'danger',
+    cancelText: '取消',
+    onOk() {
+      console.log('OK')
+    },
+    onCancel() {
+      console.log('Cancel')
+    },
+  })
+}
 
 onMounted(() => {
   fetchData()
 })
 
-const handleClick: MenuProps['onClick'] = (e) => {
-  console.log(e)
+const menusubhandleClick: MenuProps['onClick'] = (e) => {
+  // console.log('click', JSON.parse(JSON.stringify(e.item.originItemValue)) )
+  // alert(`当前打开的是${e.key}`)
+  title.value = JSON.parse(JSON.stringify(e.item.originItemValue)) 
   
-  console.log('click', e)
-  alert(`当前打开的是${e.key}`)
+
+
 }
-watch(navopenKeys, (val) => {
-  console.log('navopenKeys', val)
-})
+// watch(navopenKeys, (val) => {
+//   console.log('-----------')
+//   console.log('navopenKeys', val)
+// })
 </script>
 
 <template>
@@ -406,7 +423,7 @@ watch(navopenKeys, (val) => {
         <div class="search">
           <a-input placeholder="请输入搜索内容">
             <template #prefix>
-              <SearchOutlined />
+              <PlusOutlined />
             </template>
           </a-input>
         </div>
@@ -417,14 +434,14 @@ watch(navopenKeys, (val) => {
           style="width: 256px;height: 900px;"
           mode="inline"
           :items="items"
-          @click="handleClick"
+          @click="menusubhandleClick"
         />
       </div>
       <div class="main"> 
         <div class="designation">
           <p>
             <span>▋</span>
-            {{ `车间名称` }}
+            {{ title.label }}
           </p>
         </div>
         <!-- 表单 -->
@@ -513,6 +530,7 @@ watch(navopenKeys, (val) => {
           <a-col :span="24">
             <a-table
               class="ant-table-striped" :data-source="dataSource" :row-selection="rowSelection"
+              style="width: 1000px;"
               :columns="columns"
               :row-class-name="(_record, index) => (index % 2 === 1 ? 'table-tr-b' : 'table-tr-a')" :scroll="{ x: 1500, y: 500 }"
             >
@@ -636,7 +654,10 @@ watch(navopenKeys, (val) => {
                   </a-row>
                 </template>
                 <template v-else-if="column.key === 'key'">
-                  <div><a>详情</a></div>
+                  <div centered style="color: red;cursor:pointer" @click="showDeleteConfirm">
+                    删除
+                  </div>
+                  <contextHolder />
                 </template>
               </template>
             </a-table>
@@ -650,17 +671,16 @@ watch(navopenKeys, (val) => {
 <style scoped lang="less">
 .card{
   box-sizing: border-box;
-  width: 90%;
+  width: 1800px;
   margin: 0 auto;
- overflow: hidden;
+  overflow: hidden;
   border-radius: 3px;
 
   .mainbody{
     box-sizing: border-box;
     display: flex;
-    width: 100%;
-    height: 1000px;
-
+    width: 1420px;
+   height: 942px; 
 
   .aside{
      margin: 50px 0;
@@ -678,7 +698,7 @@ watch(navopenKeys, (val) => {
        margin: 10px 0 ;
       
         p{
-            width: 110px;
+            width: 120px;
             height: 24px;
             margin-bottom: 15px; 
             font-family: "AlibabaPuHuiTi_3_55_Regular-55 Regular";
diff --git a/yunxi-ui-admin-vben/src/views/users/mine.rar b/yunxi-ui-admin-vben/src/views/users/mine.rar
deleted file mode 100644
index b150a5f8e06fc71b53d9221e2b8839ec2260871d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5661
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
Ax&QzG

diff --git a/yunxi-ui-admin-vben/src/views/users/mine/index.vue b/yunxi-ui-admin-vben/src/views/users/mine/index.vue
index f47166cc..a2636260 100644
--- a/yunxi-ui-admin-vben/src/views/users/mine/index.vue
+++ b/yunxi-ui-admin-vben/src/views/users/mine/index.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
-  import {onMounted, reactive, ref, toRefs, getCurrentInstanc, getCurrentInstance} from 'vue'
+import { getCurrentInstanc, getCurrentInstance, onMounted, reactive, ref, toRefs } from 'vue'
 import type { UnwrapRef } from 'vue'
 
-  // let {proxy}=getCurrentInstanc
+// let {proxy}=getCurrentInstanc
 import {
   FieldTimeOutlined,
   LeftOutlined, ManOutlined,
@@ -12,9 +12,9 @@ import {
 } from '@ant-design/icons-vue'
 
 
-  import { getUserProfileApi, updateUserProfileApi, uploadAvatarApi } from '@/api/base/profile'
-  import { exportLoginLog, getLoginLogPage } from '@/api/system/loginLog'
-  import { deleteNotice, getNoticePage } from '@/api/system/notice'
+import { getUserProfileApi, updateUserProfileApi, uploadAvatarApi } from '@/api/base/profile'
+import { exportLoginLog, getLoginLogPage } from '@/api/system/loginLog'
+import { deleteNotice, getNoticePage } from '@/api/system/notice'
 
 
 /* let userInfo = reactive({
@@ -62,12 +62,12 @@ function handleOk() {
 }
 const state = reactive({
   checked1: true,
-  userInfo: {}
+  userInfo: {},
 })
 onMounted( async () => {
   debugger
   state.userInfo = await getUserProfileApi()
-  console.log("55555555" + state.userInfo);
+  console.log(`55555555${  state.userInfo}`)
   debugger
 })
 
diff --git a/yunxi-ui-admin-vben/src/views/users/newNustomer/index.vue b/yunxi-ui-admin-vben/src/views/users/newNustomer/index.vue
index f1278b1e..59dcc1f2 100644
--- a/yunxi-ui-admin-vben/src/views/users/newNustomer/index.vue
+++ b/yunxi-ui-admin-vben/src/views/users/newNustomer/index.vue
@@ -6,15 +6,9 @@ import type { SelectProps, UploadChangeParam, UploadProps } from 'ant-design-vue
 import type { Rule } from 'ant-design-vue/es/form'
 import type { Dayjs } from 'dayjs'
 
-//结算信息切换
-const values = ref<any>('buyout')
-
-const isVisible =  ref(true)
-// const isVisible2 = ref(false)
-// const toggleBlocks: any = () => {
-//   isVisible.value = !isVisible.value
-//   isVisible2.value = !isVisible2.value
-// } 
+//结算信息切换  //保留
+const wayvalues = ref<number>(1)
+const payvalues = ref<number>(1)
 
 type RangeValue = [Dayjs, Dayjs]
 const dayvalue1 = ref<RangeValue>()
@@ -1546,36 +1540,101 @@ const RabbitStyle = [{
             <a-form
               :model="formState"
               name="basic"
-              :label-col="{ span: 5 }"
+              :label-col="{ span: 2 }"
               :wrapper-col="{ span: 13 }"
-              autocomplete="off"
-              :rules="rules"
-              @finish="onFinish"
-              @finishFailed="onFinishFailed"
             >
               <a-form-item
                 label="合作方式"
                 name="username"
-                :rules="[{ required: true, message: '选择' }]"
               >
-                <a-radio-group v-model:value="values">
-                  <a-radio :value="buyout">
+                <a-radio-group v-model:value="wayvalues">
+                  <!-- 保留 -->
+                  <a-radio class="rabiostyle" :value="1">
                     买断
                   </a-radio>
-                  <a-radio :value="joint">
+                  <a-radio class="rabiostyle" :value="2">
                     联营
                   </a-radio>
                 </a-radio-group>
               </a-form-item>
-              <div v-if="isVisible" class="buyout">
-                123
+              <div v-if="wayvalues === 1" class="buyout">
+                <a-form-item
+                  label="结算方式"
+                  name="username"
+                >
+                  <a-radio-group v-model:value="payvalues">
+                    <a-radio class="rabiostyle" :value="1">
+                      先贷后款
+                    </a-radio>
+                    <a-radio class="rabiostyle" :value="2">
+                      先款后贷
+                    </a-radio>
+                  </a-radio-group>
+                </a-form-item>
               </div>
-              <div v-else class="joint">
+              <div v-if="wayvalues === 2" class="joint">
                 321
               </div>
             </a-form>
           </div>
         </div>
+        <!-- 联系人信息 -->
+        <div class="representativemation">
+          <div class="moduletop">
+            <p>
+              <span>▋</span>
+              联系人信息
+            </p>
+          </div>
+          <div class="mationtable">
+            <a-table :columns="mationtablecolumns" :data-source="mationtabledata">
+              <template #headerCell="{ column }">
+                <template v-if="column.key === 'type'">
+                  <span>
+                    类型
+                  </span>
+                </template>
+              </template>
+
+              <template #bodyCell="{ column, record }">
+                <template v-if="column.key === 'name'">
+                  {{ record.name }}
+                </template>
+                <template v-else-if="column.key === 'identificationphoto'">
+                  <a :href="record.identificationphoto">
+                    查看
+                  </a>
+                </template>
+                <template v-else-if="column.key === 'Idnumber'">
+                  <span>
+                    {{ record.Idnumber }}
+                  </span>
+                </template>
+                <template v-else-if="column.key === 'validity'">
+                  <span>
+                    {{ record.validity }}
+                  </span>
+                </template>
+                <template v-else-if="column.key === 'impower'">
+                  <a :hreflang="record.impower">
+                    查看
+                  </a>
+                </template>
+                <template v-else-if="column.key === 'turnover'">
+                  <span>
+                    {{ record.turnover }}
+                  </span>
+                </template>
+                <template v-else-if="column.key === 'operate'">
+                  <a>
+                    <EditOutlined />
+                    操作
+                  </a>
+                </template>
+              </template>
+            </a-table>
+          </div>
+        </div>
       </a-form>
     </div>
   </a-card>
@@ -1673,6 +1732,8 @@ const RabbitStyle = [{
   .subdivide{
     width: 30%;
   }
+
+  .modaliy{}
 }
    
 }