From ae9ddf81d5197c8dbf31e586502b2bf7a7c98163 Mon Sep 17 00:00:00 2001
From: zmj <1493694146@qq.com>
Date: Fri, 10 Nov 2023 16:35:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/company/edit.vue                   | 22 +++++-----
 src/views/examined/index_list.vue            |  5 ++-
 src/views/task_template/dialog_commodity.vue | 43 +++++++-------------
 3 files changed, 28 insertions(+), 42 deletions(-)

diff --git a/src/views/company/edit.vue b/src/views/company/edit.vue
index b27d319..49ed518 100644
--- a/src/views/company/edit.vue
+++ b/src/views/company/edit.vue
@@ -7,7 +7,7 @@
       :rules="formRules"
     >
       <!-- <div style="font-size: 1.2rem; margin: 10px 0">公司基本信息创建</div> -->
-      <el-col :span="24" class="el-card pt-6">
+      <el-col :span="24" class="pt-6 el-card">
         <div class="tit">公司基本信息创建</div>
         <el-row>
           <el-form-item label="公司名称" prop="company_name">
@@ -233,7 +233,7 @@
           </el-col>
         </el-row>
       </el-col>
-      <el-col :span="24" class="el-card pt-6">
+      <el-col :span="24" class="pt-6 el-card">
         <div class="tit">主要联系人</div>
         <!-- <div
           style="
@@ -353,7 +353,7 @@
           </el-main>
         </el-container>
       </el-col>
-      <el-col :span="24" class="el-card pt-6">
+      <el-col :span="24" class="pt-6 el-card">
         <div class="tit">其他联系人</div>
 
         <el-row>
@@ -429,7 +429,7 @@
         </el-row>
       </el-col>
       <!-- <div style="font-size: 1.2rem; margin: 10px 0">资质信息</div> -->
-      <el-col :span="24" class="el-card pt-6">
+      <el-col :span="24" class="pt-6 el-card">
         <div class="tit">资质信息</div>
 
         <el-row>
@@ -439,7 +439,7 @@
                 :disabled="isDisabled"
                 :accept="acceptFileTypes"
                 v-model="formData.qualification.business_license"
-                class="avatar-uploader pl-3"
+                class="pl-3 avatar-uploader"
                 :data="{ cid: 1 }"
                 :headers="{ Token: userStore.token }"
                 :action="base_url + '/upload/image'"
@@ -468,7 +468,7 @@
                 v-if="imgflag"
                 :accept="acceptFileTypes"
                 :disabled="isDisabled"
-                class="avatar-uploader pl-3"
+                class="pl-3 avatar-uploader"
                 :data="{ cid: 1 }"
                 :headers="{ Token: userStore.token }"
                 :action="base_url + '/upload/image'"
@@ -488,7 +488,7 @@
                 :disabled="isDisabled"
                 :accept="acceptFileTypes"
                 v-model="formData.qualification.business_licenseB"
-                class="avatar-uploader pl-3"
+                class="pl-3 avatar-uploader"
                 :data="{ cid: 1 }"
                 :headers="{ Token: userStore.token }"
                 :action="base_url + '/upload/image'"
@@ -509,8 +509,8 @@
         </el-row>
       </el-col>
       <!-- <div style="font-size: 1.2rem; margin: 10px 0">电子合同</div> -->
-      <!-- <el-col v-if="isshow" :span="24" class="el-card pt-6"> -->
-      <el-col v-if="false" :span="24" class="el-card pt-6">
+      <!-- <el-col v-if="isshow" :span="24" class="pt-6 el-card"> -->
+      <el-col v-if="false" :span="24" class="pt-6 el-card">
         <div class="tit">电子合同</div>
 
         <el-row>
@@ -591,7 +591,7 @@
           </el-col>
         </el-row>
       </el-col>
-      <!-- <el-col v-if="isshow" :span="24" class="el-card pt-6">
+      <!-- <el-col v-if="isshow" :span="24" class="pt-6 el-card">
                 <el-row>
                     <el-col :span="24">
                         <el-form-item label="合同上传" required>
@@ -615,7 +615,7 @@
       <el-col
         v-if="(isDisabled == false && isEdit == false) || isEdit"
         :span="24"
-        class="el-card pt-6"
+        class="pt-6 el-card"
       >
         <el-form-item label prop="field139">
           <el-button v-if="isEdit" type="primary" size="medium" @click="create"
diff --git a/src/views/examined/index_list.vue b/src/views/examined/index_list.vue
index 2528e7d..dece1df 100644
--- a/src/views/examined/index_list.vue
+++ b/src/views/examined/index_list.vue
@@ -112,7 +112,7 @@
           </el-table-column>
         </el-table>
       </div>
-      <div class="flex mt-4 justify-end">
+      <div class="flex justify-end mt-4">
         <pagination v-model="pager" @change="getLists" />
       </div>
     </el-card>
@@ -173,7 +173,7 @@ const checkStatusList = ref([
 ]);
 
 // 显示默认审批界面的类型
-const showAuditTypeList = ref([1, 5, 6]);
+const showAuditTypeList = ref([1, 5, 6,4]);
 const showAuditOther = computed(() => {
   return showAuditTypeList.value.includes(openType.value);
 });
@@ -204,6 +204,7 @@ const handleAdd = async () => {
 
 // 编辑
 const handleEdit = async (data: any, type = "edit") => {
+  console.log(data.type)
   openType.value = data.type;
   showEdit.value = true;
   await nextTick();
diff --git a/src/views/task_template/dialog_commodity.vue b/src/views/task_template/dialog_commodity.vue
index 1596308..04314cc 100644
--- a/src/views/task_template/dialog_commodity.vue
+++ b/src/views/task_template/dialog_commodity.vue
@@ -3,20 +3,10 @@
     <el-card class="!border-none" shadow="never">
       <el-form class="mb-[-16px]" :model="queryParams" inline>
         <el-form-item label="商品名称" prop="company_name">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.keyword"
-            clearable
-            placeholder="请输入商品名称"
-          />
+          <el-input class="w-[280px]" v-model="queryParams.keyword" clearable placeholder="请输入商品名称" />
         </el-form-item>
         <el-form-item label="商品编号" prop="company_type">
-          <el-input
-            class="w-[280px]"
-            v-model="queryParams.no"
-            clearable
-            placeholder="商品编号"
-          />
+          <el-input class="w-[280px]" v-model="queryParams.no" clearable placeholder="商品编号" />
         </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="resetPage">查询</el-button>
@@ -24,35 +14,26 @@
         </el-form-item>
       </el-form>
     </el-card>
-    <el-card class="!border-none" v-loading="pager.loading" shadow="never">
+    <!-- <el-card class="!border-none" v-loading="pager.loading" shadow="never"> -->
+    <el-card class="!border-none"  shadow="never">
       <div class="mt-4">
-        <el-table
-          ref="tableRef"
-          :data="pager.lists"
-          @selection-change="handleSelectionChange"
-        >
+        <el-table ref="tableRef" :data="pager.lists" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="55" />
           <el-table-column label="ID" property="product_id" />
           <el-table-column label="图片" property="image">
             <template #default="{ row }">
-              <el-image
-                :src="row.image"
-                style="width: 80px; height: 80px"
-                fit="cover"
-              ></el-image>
+              <el-image :src="row.image" style="width: 80px; height: 80px" fit="cover"></el-image>
             </template>
           </el-table-column>
           <el-table-column label="商品名称" property="store_name" />
           <el-table-column label="价格" property="price" />
         </el-table>
       </div>
-      <div class="flex mt-4 justify-end">
+      <div class="flex justify-end mt-4">
         <pagination v-model="pager" @change="getLists" :pageSizes="[10]" />
       </div>
       <div class="flex justify-end mt-2">
-        <el-button type="primary" @click="handleCurrentChange(changeList)"
-          >确认</el-button
-        >
+        <el-button type="primary" @click="handleCurrentChange(changeList)">确认</el-button>
         <el-button @click="commodityClose">取消</el-button>
       </div>
     </el-card>
@@ -101,7 +82,6 @@ let count = 0;
 const handleSelectionChange = (value: any[]) => {
   // 在翻页时,上一页的数据会被清空, 不得已使用二维数组存取数据
   let index = pager.page ? pager.page - 1 : 0;
-  if (!changeList.value[index]) changeList.value.push([]);
   // 同一页选择多个商品时, 每选择一次, 此方法都会被调用, 所以选择多个时此方法会被调用多次, 在翻页时会出现漏选, 使用此方法避免
   if (index != count && value.length < changeList.value[index].length) {
     console.log("加载中");
@@ -123,7 +103,12 @@ const { pager, getLists, resetParams, resetPage } = usePaging({
   size: 10,
 });
 
-getLists();
+getLists().then(res=>{
+  for(let i=0;i<Math.ceil(pager.count / pager.size)-1;i++){
+    changeList.value.push([])
+  }
+
+});
 
 // 监听数据变化进行勾选
 watch(