From 936d2a71da82c58bc92ea4e4e77f7e9b47988b52 Mon Sep 17 00:00:00 2001
From: lxz <lxz15516116653@163.com>
Date: Sat, 20 Jan 2024 10:28:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B7=9F=E8=BF=9B=E8=AE=B0=E5=BD=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/annexUpload/index.vue | 24 ++++++++++++
 src/views/custom/detail.vue          |  9 +----
 src/views/custom/edit.vue            | 58 ++++++++++++++--------------
 src/views/custom_follow/edit.vue     |  4 +-
 4 files changed, 57 insertions(+), 38 deletions(-)
 create mode 100644 src/components/annexUpload/index.vue

diff --git a/src/components/annexUpload/index.vue b/src/components/annexUpload/index.vue
new file mode 100644
index 0000000..b1e17bf
--- /dev/null
+++ b/src/components/annexUpload/index.vue
@@ -0,0 +1,24 @@
+
+import type { isTemplate } from 'element-plus/es/utils';
+<template>
+    <el-upload
+        accept="doc, docx, xls, xlsx, ppt, pptx, pdf, txt, zip, rar, tar, jpg, png, gif, jpeg, webp, wmv, avi, mpg, mpeg, 3gp, mov, mp4, flv, f4v, rmvb, mkv"
+        class="upload-demo" :show-file-list="false" aria-hidden="true" :headers="{ Token: userStore.token }"
+        :action="base_url + '/upload/file'" :on-success="handleAvatarSuccess_four" ref="upload">
+        <el-button type="primary">
+            上传
+        </el-button>
+    </el-upload>
+    <div>
+        <div v-for="(item, index) in formData.annex" style="margin-left: 5px;display: block;">
+            <a style="margin-left: 10px; color: #4a5dff; align-self: flex-start" :href="item.uri" target="_blank">{{
+                item.name }}</a>
+            <span style="cursor: pointer;margin-left: 5px;" @click="delFileFn(index)">x</span>
+        </div>
+    </div>
+</template>
+<script>
+
+
+
+</script>
\ No newline at end of file
diff --git a/src/views/custom/detail.vue b/src/views/custom/detail.vue
index d4750e0..1e89f5c 100644
--- a/src/views/custom/detail.vue
+++ b/src/views/custom/detail.vue
@@ -7,18 +7,13 @@
             <el-form ref="formRef" :model="formData" label-width="90px">
                 <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
                     <el-tab-pane label="客户信息" name="new_name_1">
-
-
-
-
                         <el-descriptions title="基本信息" :column="2" border>
-
                             <el-descriptions-item label="客户名称" label-align="left" align="left"
                                 label-class-name="my-label">{{ formData.name }}</el-descriptions-item>
                             <el-descriptions-item label="客户属性" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.custom_type_text }}</el-descriptions-item>
-                            <el-descriptions-item label="上级公司" label-align="left" align="left" label-class-name="my-label">
-                                {{ formData.parent_company }}</el-descriptions-item>
+                            <!-- <el-descriptions-item label="上级公司" label-align="left" align="left" label-class-name="my-label">
+                                {{ formData.company_name }}</el-descriptions-item> -->
                             <el-descriptions-item label="客户地址" label-align="left" align="left" label-class-name="my-label">
                                 {{ formData.address }}
                             </el-descriptions-item>
diff --git a/src/views/custom/edit.vue b/src/views/custom/edit.vue
index c0245ea..1ae0548 100644
--- a/src/views/custom/edit.vue
+++ b/src/views/custom/edit.vue
@@ -17,7 +17,7 @@
                         <el-col :span="8">
                             <el-form-item label="客户姓名" prop="name"
                                 :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                                <el-input v-model="formData.name" placeholder="请输入本文行单客户姓名" clearable
+                                <el-input v-model="formData.name" placeholder="请输入客户姓名" clearable
                                     :style="{ width: '100%' }"></el-input>
                             </el-form-item>
                         </el-col>
@@ -31,36 +31,25 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="8">
-                            <el-form-item label="上级公司" prop="parent_company">
-                                <el-input v-model="companyname" placeholder="请输入上级公司"
+                        <!-- <el-col :span="8"> -->
+                        <!-- <el-form-item label="上级公司" prop="parent_company">
+                                <el-input v-model="companyname" placeholder="请输入上级公司" @click="showDialog = true"
                                     @change="companyname.length == 0 ? formData.parent_company = '' : ''" clearable
                                     :style="{ width: '100%' }">
                                     <template #append>
                                         <el-button @click="showDialog = true">选择</el-button>
-                                        {{ formData.parent_company }}
                                     </template>
                                 </el-input>
-                            </el-form-item>
-                        </el-col>
+                            </el-form-item> -->
+                        <!-- </el-col> -->
                         <el-col :span="8">
                             <el-form-item label="电话" prop="phone"
-                                :rules="[{ required: true, validator: checkPhone, trigger: 'blur' }]">
+                                :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
                                 <el-input v-model="formData.phone" placeholder="请输入电话" clearable :style="{ width: '100%' }">
                                 </el-input>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="16">
-                            <el-form-item label="信用度" prop="credit_rating"
-                                :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
-                                <el-radio-group v-model="formData.credit_rating" placeholder="请选择信用度">
-                                    <el-radio v-for="(item, index) in dictData.credit_rating" :key="index"
-                                        :label="parseInt(item.value)">
-                                        {{ item.name }}
-                                    </el-radio>
-                                </el-radio-group>
-                            </el-form-item>
-                        </el-col>
+
                         <el-col :span="4">
                             <el-form-item label="省" prop="province"
                                 :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
@@ -89,11 +78,22 @@
                                 </el-select>
                             </el-form-item>
                         </el-col>
-                        <el-col :span="12">
+                        <el-col :span="6">
                             <el-form-item label="地址" prop="address">
                                 <el-input v-model="formData.address" clearable placeholder="请输入地址" />
                             </el-form-item>
                         </el-col>
+                        <el-col :span="6">
+                            <el-form-item label="信用度" prop="credit_rating"
+                                :rules="[{ required: true, message: '不可为空', trigger: 'blur' }]">
+                                <el-radio-group v-model="formData.credit_rating" placeholder="请选择信用度">
+                                    <el-radio v-for="(item, index) in dictData.credit_rating" :key="index"
+                                        :label="parseInt(item.value)">
+                                        {{ item.name }}
+                                    </el-radio>
+                                </el-radio-group>
+                            </el-form-item>
+                        </el-col>
                         <el-col :span="24">
                             <el-form-item label="备注" prop="notes">
                                 <el-input v-model="formData.notes" type="textarea" placeholder="请输入备注"
@@ -308,9 +308,9 @@
                 </el-card>
             </el-form>
         </popup>
-        <el-dialog v-model="showDialog" title="选择客户" width="70%">
+        <!-- <el-dialog v-model="showDialog" title="选择客户" width="70%">
             <customDialog @customEvent="customEvent"></customDialog>
-        </el-dialog>
+        </el-dialog> -->
     </div>
 </template>
 
@@ -339,7 +339,7 @@ const emit = defineEmits(['success', 'close'])
 const formRef = shallowRef<FormInstance>()
 const popupRef = shallowRef<InstanceType<typeof Popup>>()
 const mode = ref('add')
-const companyname = ref('')
+// const companyname = ref('')
 const list1 = reactive([])
 const showDialog = ref(false);
 const list2 = reactive([])
@@ -356,11 +356,11 @@ const datas = reactive({
     areaOptions: [],
 });
 
-const customEvent = (e: any) => {
-    formData.parent_company = e.id;
-    companyname.value = e.name;
-    showDialog.value = false;
-};
+// const customEvent = (e: any) => {
+//     formData.parent_company = e.id;
+//     companyname.value = e.name;
+//     showDialog.value = false;
+// };
 
 const handleAdd = (row: any) => {
     // 在 row 后面插入一行数据
@@ -449,7 +449,7 @@ const formData = reactive({
     org_id: '',
     name: '',
     custom_type: '',
-    parent_company: '',
+    // parent_company: '',
     phone: '',
     credit_rating: '',
     province: '',
diff --git a/src/views/custom_follow/edit.vue b/src/views/custom_follow/edit.vue
index 204b1ca..7bb5b6b 100644
--- a/src/views/custom_follow/edit.vue
+++ b/src/views/custom_follow/edit.vue
@@ -139,9 +139,9 @@ const setFormData = async (data: Record<any, any>) => {
     }
 
     //@ts-ignore
-    formData.date = timeFormat(formData.date, 'yyyy-mm-dd hh:MM:ss')
+    formData.date = timeFormat(formData.date, 'yyyy-mm-dd')
     //@ts-ignore
-    formData.next_follow_date = timeFormat(formData.next_follow_date, 'yyyy-mm-dd hh:MM:ss')
+    formData.next_follow_date = timeFormat(formData.next_follow_date, 'yyyy-mm-dd')
 }
 
 const getDetail = async (row: Record<string, any>) => {