From 31388f555daee73efb27ad834827d5dede470079 Mon Sep 17 00:00:00 2001
From: jiangyouyi <763484914@qq.com>
Date: Thu, 10 Aug 2023 16:41:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E2=80=9C=20git=20commit=20-m?=
 =?UTF-8?q?=20=E6=9B=B4=E6=96=B0=E2=80=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/edit.vue              | 19 +++++++++++++++----
 src/views/contract/contractDetil.vue    | 16 ++++++++++------
 src/views/task/edit.vue                 | 11 +++++++----
 src/views/task/taskCalendar.vue         |  9 +++++----
 src/views/user_informationg/details.vue |  4 +---
 5 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index 377d352..0a47f3d 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -176,6 +176,7 @@
                 <div class="tit">主要联系人</div>
                 <div class="headimg">
                     <el-upload
+                        :disabled="isDisabled"
                         v-model="formData.avatar"
                         class="avatar-uploader-head"
                         :data="{ cid: 1 }"
@@ -362,13 +363,13 @@
                                 </el-icon>
                             </el-upload>
                         </el-form-item>
-                        <el-form-item label="其他资质">
+                        <el-form-item class="others" label="其他资质">
                             <div
                                 v-for="(v, i) in formData.qualification.bank_account"
                                 :key="i"
                                 class="otherimg"
                             >
-                                <img :src="v" />
+                                <img :src="v" @click="clickdelete(i)" >
                             </div>
                             <el-upload
                                 v-if="imgflag"
@@ -532,7 +533,7 @@
         </el-dialog>
     </div>
 </template>
-
+1
 <script lang="ts" setup name="companyEdit">
 import type { FormInstance, UploadProps, ElMessage, UploadUserFile } from 'element-plus'
 import Popup from '@/components/popup/index.vue'
@@ -947,6 +948,12 @@ const getDetails = async () => {
     console.log(formData)
     company_type_change(formData.company_type)
 }
+const  clickdelete=(index)=>{
+    if(!route.query.read){
+        formData.qualification.bank_account.splice(index, 1)         
+   } 
+}
+
 
 getdictTypeLists()
 getcontract_type()
@@ -962,7 +969,7 @@ const create = async () => {
     await formRef.value?.validate()
     const data = JSON.parse(JSON.stringify({ ...formData }))
     data.qualification.bank_account = JSON.stringify(data.qualification.bank_account)
-    if (route.query.id) {
+    if (route.query.id) {  
         await apiCompanyEdit(data)
     } else {
         await apiCompanyAdd(data)
@@ -1036,6 +1043,7 @@ defineExpose({
 }
 
 .otherimg {
+    
     img {
         width: 10vw;
         height: 6.3vw;
@@ -1049,4 +1057,7 @@ defineExpose({
 .tit {
     margin-top: 15px;
 }
+.others{
+    width: 100% !important;
+}
 </style>
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index cbae9b7..5b90fb1 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -22,7 +22,7 @@
                 />
             </el-form-item>
             <el-form-item label="主要联系人" prop="company_name" required>
-                <el-input disabled v-model="compeny.master_phone" placeholder="请输入主要联系人" />
+                <el-input disabled v-model="compeny.master_name" placeholder="请输入主要联系人" />
             </el-form-item>
             <el-form-item label="公司类型" prop="compeny">
                 <el-select
@@ -49,7 +49,7 @@
             <el-form-item label="地址" prop="address">
                 <el-input
                     disabled
-                    v-model="compeny.address_name"
+                    v-model="compeny.address"
                     placeholder="请输入公司地址"
                     :style="{ width: '32rem' }"
                 />
@@ -79,7 +79,7 @@
                 </div>
             </el-form-item>
             <el-form-item label="其他资质" prop="contract_no" required>
-                <div class="company" v-for="(v,i) in  compenyimg.bank_account" :key="i">
+                <div class="company other" v-for="(v,i) in  compenyimg.bank_account" :key="i">
                     <img :src="v" />
                 </div>
             </el-form-item>
@@ -116,8 +116,8 @@
                     <el-option></el-option>
                 </el-select>
             </el-form-item>
-            <el-form-item label="主要联系人" prop="company_name" required>
-                <el-input disabled v-model="compenyB.master_phone" placeholder="请输入主要联系人" />
+            <el-form-item label="主要联系人" prop="master_name" required>
+                <el-input disabled v-model="compenyB.master_name" placeholder="请输入主要联系人" />
             </el-form-item>
             <el-form-item label="省" prop="province">
                 <el-select disabled v-model="compenyB.province_name" placeholder="请选择省">
@@ -168,7 +168,7 @@
                     <img :src="compenyBimg.business_licenseB" />
                 </div>
             </el-form-item>
-            <el-form-item label="其他资质" prop="contract_no" required>
+            <el-form-item class="other" label="其他资质" prop="contract_no" required>
                 <div class="company" v-for="(v,i) in  compenyBimg.bank_account" :key="i">
                     <img :src="v" />
                 </div>
@@ -420,6 +420,7 @@ onMounted(async () => {
     img {
         width: 10vw;
         height: 6.3vw;
+        margin-right: 10px;
     }
 }
 .persenal {
@@ -440,6 +441,9 @@ onMounted(async () => {
     .el-form-item {
         width: 40%;
     }
+    .other{
+        width: 100% !important;
+    }
 }
 .el-card {
     margin-top: 10px;
diff --git a/src/views/task/edit.vue b/src/views/task/edit.vue
index 55d8713..2aaf88e 100644
--- a/src/views/task/edit.vue
+++ b/src/views/task/edit.vue
@@ -46,22 +46,25 @@ const props = defineProps({
     type: Date,
     default: () => null,
   },
+  detailsdata:{
+    type:Object,
+    default:{}
+  }
 });
 const emit = defineEmits(["success", "close"]);
 const formRef = shallowRef<FormInstance>();
 const popupRef = shallowRef<InstanceType<typeof Popup>>(); 
 const mode = ref("add");
 const datetime = ref(null);
-
+const detailsdt = ref({});
 // 弹窗标题
 // const popupTitle = computed(() => {
 //   return mode.value == "edit" ? "创建日程安排" : "新增任务";
 // });
 
 onMounted(() => {
-  props.dateValue?.toDateString()
-    ? (formData.start_time = props.dateValue.toDateString())
-    : null;
+  // props.detailsdata?.toDateString()? (detailsdt = props.detailsdata):null;
+
 });
 
 const priorityList = reactive([
diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue
index 2be707d..1de4a6c 100644
--- a/src/views/task/taskCalendar.vue
+++ b/src/views/task/taskCalendar.vue
@@ -44,6 +44,7 @@
       ref="editRef"
       :dict-data="dictData"
       :dateValue="dateValue"
+      :detailsdata="detailsdata"
       @success="loadTask"
       @close="showEdit = false"
     />
@@ -61,11 +62,11 @@ import EditPopup from "./edit.vue";
 import { reactive, watch } from "vue";
 import { apiTaskList ,apiTaskDetails}    from '@/api/task'
 const dateValue = ref(new Date());
-
-watch(() => dateValue,(newValue, oldValue) => {
-    editRef.value?.open("add");
+ watch(() => dateValue, async(newValue, oldValue) => {
+     editRef.value?.open("add");
     initShowDate(timeFormat(newValue.value.getTime()));
-    //  console.log(taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime())));
+   const id=taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime())).template_id
+   const detailsdata = await  apiTaskDetails({id})  
   },
   { deep: true }
 );
diff --git a/src/views/user_informationg/details.vue b/src/views/user_informationg/details.vue
index b44b359..ca93809 100644
--- a/src/views/user_informationg/details.vue
+++ b/src/views/user_informationg/details.vue
@@ -88,9 +88,7 @@
                 :value="
                   formData.area_name +
                   formData.street_name +
-                  formData.village_name +
-                  formData.brigade_name
-                "
+                  formData.village_name"
                 placeholder="请输入地址"
                 clearable
                 :style="{ width: '100%' }"