From 5652e661314e482e5fb9dd04562c07f250c58fdd Mon Sep 17 00:00:00 2001
From: jiangyouyi <763484914@qq.com>
Date: Wed, 9 Aug 2023 18:11:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/index.vue          |   9 +-
 src/views/contract/contractDetil.vue |  27 +++--
 src/views/task/edit.vue              | 152 ++++-----------------------
 src/views/task/taskCalendar.vue      |   2 -
 src/views/task_scheduling/index.vue  |  22 +++-
 5 files changed, 65 insertions(+), 147 deletions(-)

diff --git a/src/views/company/index.vue b/src/views/company/index.vue
index 9d9fed4..e757016 100644
--- a/src/views/company/index.vue
+++ b/src/views/company/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card class="!border-none mb-4" shadow="never">
-      <el-form class="mb-[-16px]" :model="queryParams" inline>
+      <el-form  class="mb-[-16px] formdata" :model="queryParams" inline>
         <el-form-item label="公司名称" prop="company_name">
           <el-input
             class="w-[280px]"
@@ -150,7 +150,7 @@
           <el-table-column
             label="操作"
             align="center"
-            width="500"
+            width="510"
             fixed="right"
           >
             <template #default="{ row }">
@@ -567,4 +567,9 @@ h1 {
   display: flex;
   justify-content: space-around;
 }
+.formdata{
+  .el-form-item{
+    width: 20%;
+  }
+}
 </style>
diff --git a/src/views/contract/contractDetil.vue b/src/views/contract/contractDetil.vue
index 506037e..cbae9b7 100644
--- a/src/views/contract/contractDetil.vue
+++ b/src/views/contract/contractDetil.vue
@@ -78,9 +78,9 @@
                     <img :src="compenyimg.business_licenseB" />
                 </div>
             </el-form-item>
-            <el-form-item label="其他资质" prop="contract_no">
-                <div class="company">
-                    <img :src="compenyimg.bank_account" />
+            <el-form-item label="其他资质" prop="contract_no" required>
+                <div class="company" v-for="(v,i) in  compenyimg.bank_account" :key="i">
+                    <img :src="v" />
                 </div>
             </el-form-item>
         </el-form>
@@ -156,17 +156,21 @@
             :model="formData"
             label-width="90px"
             :rules="formRules"
+             class="company_z"
         >
-            <el-form-item label="公司资质" prop="contract_type" required>
+        <el-form-item label="公司资质" prop="contract_type" required>
                 <div class="company">
-                    <img :src="compenyimg.business_license" />
-                    <img :src="compenyimg.business_licenseB" />
+                    <img :src="compenyBimg.business_license" />
+                </div>
+            </el-form-item>
+            <el-form-item label-width="120px" label="开户许可证" prop="contract_no" required>
+                <div class="company">
+                    <img :src="compenyBimg.business_licenseB" />
                 </div>
             </el-form-item>
             <el-form-item label="其他资质" prop="contract_no" required>
-                <div class="company">
-                    <img :src="compenyimg.bank_account" />
-                    <img :src="compenyimg.bank_account" />
+                <div class="company" v-for="(v,i) in  compenyBimg.bank_account" :key="i">
+                    <img :src="v" />
                 </div>
             </el-form-item>
         </el-form>
@@ -351,8 +355,13 @@ async function render() {
             res.party_a_info.qualification.bank_account
         )
         compenyimg.value = res.party_a_info.qualification
+        res.party_b_info.qualification.bank_account = JSON.parse(
+            res.party_b_info.qualification.bank_account
+        )
+        compenyBimg.value = res.party_b_info.qualification
     } catch (error) {}
     compenyimg.value = res.party_a_info.qualification
+    console.log(compenyimg.value );
     if (res.type == 2) {
         show.value = false
         res.party_b_info.sex == 1 ? (res.party_b_info.sex = '男') : (res.party_b_info.sex = '女')
diff --git a/src/views/task/edit.vue b/src/views/task/edit.vue
index 844b1eb..55d8713 100644
--- a/src/views/task/edit.vue
+++ b/src/views/task/edit.vue
@@ -4,141 +4,28 @@
       ref="popupRef"
       title="创建日程安排"
       :async="true"
-      width="1000px"
+      width="800px"
       @confirm="handleSubmit"
       @close="handleClose"
     >
-      <el-form class="formdata" ref="formRef" :model="formData" label-width="120px">
-        <el-col class="pt-6 !border-none">
-          <el-row>
-            <el-col :span="16">
-              <el-form-item label="任务主题" prop="title">
-                <el-input
-                  v-model="formData.title"
-                  placeholder="请输入任务主题"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="优先级" prop="name">
-                <el-select
-                  v-model="formData.priority"
-                  placeholder="请输入优先级"
-                >
-                  <el-option
-                    v-for="item in priorityList"
-                    :key="item.value"
-                    :value="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="工作类型" prop="icon">
-                <el-select v-model="formData.type" placeholder="请选择工作类型">
-                  <el-option
-                    v-for="item in taskTypeList"
-                    :key="item.label"
-                    :value="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="14">
-              <el-form-item
-                style="margin-left:50px;"
-                label="是否为修复BUG"
-                label-width="auto"
-                prop="icon"
-              >
-                <el-radio-group v-model="formData.is_bug">
-                  <el-radio :label="1">是</el-radio>
-                  <el-radio :label="0">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="负责人" prop="icon">
-                <el-input
-                  v-model="formData.director_name"
-                  placeholder="请选择负责人"
-                  clearable
-                  @click="isMan = true"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="协作人" prop="icon">
-                <el-input
-                  v-model="formData.assist_admin_names"
-                  placeholder="请选择协作人"
-                  clearable
-                  @click="isManTow = true"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="审查人" prop="icon">
-                <el-input
-                  v-model="formData.assist_check_names"
-                  placeholder="请选择审查人"
-                  clearable
-                  @click="isManThe = true"
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="开始时间" prop="icon">
-                <el-date-picker
-                  type="date"
-                  placeholder="开始时间"
-                  value-format="YYYY-MM-DD"
-                  v-model="formData.start_time"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="结束时间" prop="icon">
-                <el-date-picker
-                  type="date"
-                  placeholder="预计结束时间"
-                  value-format="YYYY-MM-DD"
-                  v-model="formData.end_time"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="验收时间" prop="icon">
-                <el-date-picker
-                  type="date"
-                  placeholder="预计验收时间"
-                  value-format="YYYY-MM-DD"
-                  v-model="formData.check_time"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+    <el-form class="formdata" ref="formRef" :model="formData" label-width="120px">
+      <el-form-item  required label="时间日程范围">
+         <el-date-picker
+          v-model="datetime"
+          type="datetimerange"
+          range-separator="至"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间"
+         />
+      </el-form-item>
+    <el-form-item required label="日程内容">
+       <el-input v-model="content"/>
+    </el-form-item>  
+      <el-form-item required label="日程描述">
+       <el-input type="textarea" v-model="content"/>
+    </el-form-item>  
+    </el-form>
 
-        </el-col>
-      </el-form>
-      <el-dialog v-model="isMan" title="选择负责人" width="60%">
-        <DialogIndexMan @customEvent="customEvent" />
-      </el-dialog>
-      <el-dialog v-model="isManTow" title="选择协作人" width="60%">
-        <DialogIndexMan @customEvent="customEventMan" />
-      </el-dialog>
-      <el-dialog v-model="isManThe" title="选择审查人" width="60%">
-        <DialogIndexMan @customEvent="customEventManThe" />
-      </el-dialog>
     </popup>
   </div>
 </template>
@@ -162,8 +49,9 @@ const props = defineProps({
 });
 const emit = defineEmits(["success", "close"]);
 const formRef = shallowRef<FormInstance>();
-const popupRef = shallowRef<InstanceType<typeof Popup>>();
+const popupRef = shallowRef<InstanceType<typeof Popup>>(); 
 const mode = ref("add");
+const datetime = ref(null);
 
 // 弹窗标题
 // const popupTitle = computed(() => {
diff --git a/src/views/task/taskCalendar.vue b/src/views/task/taskCalendar.vue
index 4e228df..2be707d 100644
--- a/src/views/task/taskCalendar.vue
+++ b/src/views/task/taskCalendar.vue
@@ -41,7 +41,6 @@
     </el-card>
 
     <edit-popup
-      v-if="showEdit"
       ref="editRef"
       :dict-data="dictData"
       :dateValue="dateValue"
@@ -64,7 +63,6 @@ import { apiTaskList ,apiTaskDetails}    from '@/api/task'
 const dateValue = ref(new Date());
 
 watch(() => dateValue,(newValue, oldValue) => {
-    showEdit.value = true;  
     editRef.value?.open("add");
     initShowDate(timeFormat(newValue.value.getTime()));
     //  console.log(taskList.value.find((item)=>item.start_time.split(' ')[0]==timeFormat(newValue.value.getTime())));
diff --git a/src/views/task_scheduling/index.vue b/src/views/task_scheduling/index.vue
index a0f8d39..b15c01c 100644
--- a/src/views/task_scheduling/index.vue
+++ b/src/views/task_scheduling/index.vue
@@ -20,7 +20,14 @@
                     <el-input class="w-[280px]" v-model="queryParams.type" clearable placeholder="请输入下发公司类型" />
                 </el-form-item>
                 <el-form-item label="状态" prop="status">
-                    <el-input class="w-[280px]" v-model="queryParams.status" clearable placeholder="请输入状态" />
+                    <el-select v-model="queryParams.status" clearable placeholder="请选择状态">
+                        <el-option
+                        v-for="item in statusdata"
+                        :key="item.label"
+                        :value="item.value"
+                        :label="item.label"
+                        />
+                    </el-select>
                 </el-form-item>
                 <el-form-item>
                     <el-button class="el-btn" type="primary" @click="resetPage">查询</el-button>
@@ -49,7 +56,11 @@
                     <el-table-column label="模板id" prop="template_id" show-overflow-tooltip />
                     <el-table-column label="公司id" prop="company_id" show-overflow-tooltip />
                     <el-table-column label="下发公司类型" prop="type" show-overflow-tooltip />
-                    <el-table-column label="状态" prop="status" show-overflow-tooltip />
+                    <el-table-column label="状态" prop="status" show-overflow-tooltip>
+                    <template #default="{row}">
+                        <span>{{row.status=="1"?"显示":"隐藏"}}</span>
+                    </template>
+                    </el-table-column>
                     <el-table-column label="操作" width="120" fixed="right">
                         <template #default="{ row }">
                              <el-button
@@ -102,6 +113,13 @@ const queryParams = reactive({
     status: ''
 })
 
+const statusdata=reactive(
+    [
+    {value:"1",label:'显示'},
+    {value:"0",label:"隐藏"},
+    ]  
+)
+
 // 选中数据
 const selectData = ref<any[]>([])