Merge branch 'master' of http://git.excellentkk.cn/mkm/TaskSystem-admin

src/views/company/edit.vue

@@ -181,6 +181,7 @@
         <div class="tit">主要联系人</div>
         <div class="headimg">
           <el-upload
+            :disabled="isDisabled"
             v-model="formData.avatar"
             class="avatar-uploader-head"
             :data="{ cid: 1 }"
@@ -370,13 +371,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"
@@ -548,7 +549,7 @@
     </el-dialog>
   </div>
 </template>
-
+1
 <script lang="ts" setup name="companyEdit">
 import type {
   FormInstance,
@@ -995,6 +996,11 @@ 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();
@@ -1102,4 +1108,7 @@ defineExpose({
 .tit {
   margin-top: 15px;
 }
+.others {
+  width: 100% !important;
+}
 </style>

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-form-item label="主要联系人" prop="master_name" required>
-                <el-input disabled v-model="compenyB.master_phone" placeholder="请输入主要联系人" />
+                <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;

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()
+  // props.detailsdata?.toDateString()? (detailsdt = props.detailsdata):null;
-    ? (formData.start_time = props.dateValue.toDateString())
+
-    : null;
 });
 
 const priorityList = reactive([

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, async(newValue, oldValue) => {
-watch(() => dateValue,(newValue, oldValue) => {
+     editRef.value?.open("add");
-    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 }
 );

src/views/user_informationg/details.vue

@@ -88,9 +88,7 @@
                 :value="
                   formData.area_name +
                   formData.street_name +
-                  formData.village_name +
+                  formData.village_name"
-                  formData.brigade_name
-                "
                 placeholder="请输入地址"
                 clearable
                 :style="{ width: '100%' }"