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

src/api/task.ts

@@ -17,5 +17,5 @@ export function apiTaskAdd(params: any) {
 }
 //任务日程-列表  
 export function apiTaskList(params: any) {
-  return request.get({ url: "/task_scheduling.task_scheduling/lists", params });
+  return request.get({ url: "/task_scheduling_plan.task_scheduling_plan/lists", params });
-}
+}

src/views/contract/contractDetil.vue

@@ -7,7 +7,7 @@
             :inline="true"
             ref="formRef"
             :model="compeny"
-            label-width="90px"
+            label-width="91.5px"
             :rules="formRules"
             class="select"
         >
@@ -21,6 +21,9 @@
                     placeholder="请输入社会代码"
                 />
             </el-form-item>
+            <el-form-item label="主要联系人" prop="company_name" required>
+                <el-input disabled v-model="compeny.master_phone" placeholder="请输入主要联系人" />
+            </el-form-item>
             <el-form-item label="公司类型" prop="compeny">
                 <el-select
                     disabled
@@ -48,7 +51,7 @@
                     disabled
                     v-model="compeny.address_name"
                     placeholder="请输入公司地址"
-                    :style="{ width: '31.5rem' }"
+                    :style="{ width: '32rem' }"
                 />
             </el-form-item>
         </el-form>
@@ -90,7 +93,7 @@
             :inline="true"
             ref="formRef"
             :model="compenyB"
-            label-width="90px"
+            label-width="91.5px"
             :rules="formRules"
             class="select"
         >
@@ -113,6 +116,9 @@
                     <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>
             <el-form-item label="省" prop="province">
                 <el-select disabled v-model="compenyB.province_name" placeholder="请选择省">
                 </el-select>

src/views/task/taskCalendar.vue

@@ -18,6 +18,7 @@
                 {{ data.day.split("-").slice(1).join("-") }}
                 <!-- {{ data.isSelected ? '✔️' : '' }} -->
               </p>
+              <div>{{dateNow(data.day)}}</div>
               <div
                 class="task"
                 :class="{
@@ -25,9 +26,8 @@
                   tow: item.priority == 2,
                   the: item.priority == 3,
                 }"
-                v-if="taskList[data.day]"
                 @click="handleEdit(item)"
-                v-for="(item, index) in taskList[data.day]"
+                v-for="(item, index) in taskList"
                 :key="index"
               >
                 {{ item.title }}
@@ -61,14 +61,14 @@ import { reactive, watch } from "vue";
 import { apiTaskList }    from '@/api/task'
 const dateValue = ref(new Date());
 
-watch(
+watch(() => dateValue,(newValue, oldValue) => {
-  () => dateValue,
+    initShowDate(timeFormat(newValue.value.getTime()));   
-  (newValue, oldValue) => {
+      console.log(taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime())));
-    initShowDate(timeFormat(newValue.value.getTime()));
+      
   },
   { deep: true }
 );
-// apiTaskList()
+
 
 // 加载
 const loading = ref(true);
@@ -81,7 +81,6 @@ const showEdit = ref(false);
 const queryParams = reactive({
   start_time: "",
   end_time: "",
-  day: 1,
   page_no: 1,
   pageSize: 150,
 });
@@ -92,6 +91,9 @@ const taskList = ref<any>([]);
 const loadTask = async () => {
   //   let res: any = await apiTaskIndex(queryParams);
   //   taskList.value = res.lists;
+  apiTaskList(queryParams).then((res)=>{
+    taskList.value = res.lists
+  })
   loading.value = false;
 };
 
@@ -121,6 +123,11 @@ const initShowDate = (dateStr = "") => {
 };
 initShowDate();
 
+const dateNow = (day)=>{
+  return taskList.value.find((item)=>item.start_time.split(' ')[0]==day)?.template_name;
+}
+
+
 // 获取字典数据
 // const { dictData } = useDictData("");