From 41b7cd15c6c39c6c0eb37fcd0df7b11150197848 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Mon, 18 Sep 2023 14:26:38 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?=
 =?UTF-8?q?=E5=BA=93=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/enterpriseStandardLibraryApi.js       |  2 +-
 src/components/customField/Search.vue         | 30 +++++++++++++++----
 .../reviewPlan/ReviewPlanList.vue             | 10 +++++--
 .../standard/EnterpriseStandardList.vue       | 16 ++++++++--
 .../modules/EnterpriseStandardModal.vue       |  2 +-
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/src/api/enterpriseStandardLibraryApi.js b/src/api/enterpriseStandardLibraryApi.js
index 9c4775e7..4a59d9cd 100644
--- a/src/api/enterpriseStandardLibraryApi.js
+++ b/src/api/enterpriseStandardLibraryApi.js
@@ -11,7 +11,7 @@ const getEnterpriseStandardInfoById = (params) => getAction('/laws/standard/ente
 // 配置标准
 const allocationStandard = (params) => getAction('', params)
 // 移出标准
-const shiftStandard = (params) => getAction('', params)
+const shiftStandard = (params) => getAction('/laws/standard/enterprise/removeStandard', params)
 // 获取左侧树列表
 const getTreeList = (params) => getAction('/laws/standard/lawsTreeNode/enterprise', params)
 // 左侧树删除
diff --git a/src/components/customField/Search.vue b/src/components/customField/Search.vue
index cb88eb73..d0dbe553 100644
--- a/src/components/customField/Search.vue
+++ b/src/components/customField/Search.vue
@@ -1,7 +1,7 @@
 <template>
   <a-form layout="inline" @keyup.enter.native="searchQuery">
     <a-row :gutter="24">
-      <a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item,index) in searchList.slice(0, minLength)" :key="index" style="line-height: 48px">
+      <a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item) in searchList.slice(0, minLength)" :key="item.id" style="line-height: 48px">
         <!-- 树形选择器 -->
         <!--          <template v-if="item.fieldShowType === FieldType.TREE.value">-->
         <!--            <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
@@ -19,7 +19,8 @@
         <!--  输入框 -->
         <template
           v-if="[FieldType.TEXT_BOX.value, FieldType.TEXTAREA.value,FieldType.USER_SINGLE.value,
-              FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value]
+              FieldType.ORGAN_SINGLE.value, FieldType.STANDARD_MORE.value, FieldType.ORGAN_MORE.value,
+              FieldType.YEAR_PICKER.value]
               .includes(item.fieldShowType)">
           <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
             <a-input :placeholder="$t('pleaseEnter')+item.dbFieldTxt"
@@ -56,12 +57,28 @@
             <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
                                :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
                                :type="'select'"
-                               :triggerChange="false" :dictCode="item.dict_field"/>
+                               :triggerChange="false" :dictCode="item.dictField"/>
+          </a-form-item>
+        </template>
+        <!--   组织机构选择  -->
+        <template v-else-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)">
+          <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-tree-select
+              tree-node-filter-prop="title"
+              v-model="queryParam[item.dbFieldName]"
+              :maxTagCount="1"
+              :show-search="true"
+              :getPopupContainer="triggerNode=> triggerNode.parentNode"
+              class="box-input"
+              style="width: 100%"
+              :tree-data="categoryTreeList"
+              :placeholder="$t('pleaseSelect') + item.dbFieldTxt"
+            />
           </a-form-item>
         </template>
     </a-col>
       <template v-if="searchList.length > minLength && toggleSearchStatus">
-        <a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item,index) in searchList.slice(minLength)" :key="index" style="line-height: 48px">
+        <a-col :md="(24 / (minLength + 1))" :sm="(24 / minLength)" v-for="(item) in searchList.slice(minLength)" :key="item.id" style="line-height: 48px">
           <!--   树形选择器   -->
           <template v-if="item.fieldShowType === FieldType.TREE.value">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
@@ -86,7 +103,7 @@
             </a-form-item>
           </template>
           <!--   组织机构选择  -->
-          <template v-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)">
+          <template v-else-if="[FieldType.ORGAN_SINGLE.value, FieldType.ORGAN_MORE.value].includes(item.fieldShowType)">
             <a-form-item :label="item.dbFieldTxt" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-tree-select
                 tree-node-filter-prop="title"
@@ -115,7 +132,7 @@
               <j-dict-select-tag v-model="queryParam[item.dbFieldName]"
                                  :placeholder="$t('pleaseSelect')+item.dbFieldTxt"
                                  :type="'select'"
-                                 :triggerChange="false" :dictCode="item.dict_field" />
+                                 :triggerChange="false" :dictCode="item.dictField" />
             </a-form-item>
           </template>
         </a-col>
@@ -223,6 +240,7 @@ export default {
       this.getQueryConditionFunc(params).then((res) => {
         if (res.success) {
           this.searchList = res.result
+          console.log(this.searchList)
           // if (this.searchQueryList && this.searchQueryList.length > 0) {
           //   for (let i = 0; i < this.searchList.length; i++) {
           //     // 是要去掉这个字段的搜索？？
diff --git a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
index e74e4904..0cb12a7c 100644
--- a/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
+++ b/src/views/enterpriseStandardLibrary/reviewPlan/ReviewPlanList.vue
@@ -89,6 +89,13 @@
             <div class="table-text">{{ text || text === 0 ? text : global.emptyLine }}</div>
           </a-tooltip>
         </template>
+        <!--  主起草单位： 为了去掉横向滚动条  -->
+        <template slot="mainDraftingUnit" slot-scope="{record}">
+          <a-tooltip overlay-class-name="tooltip-style">
+            <template slot="title">{{ record.mainDraftingUnit || record.mainDraftingUnit === 0 ? record.mainDraftingUnit : global.emptyLine }}</template>
+            <div class="table-text">{{ record.mainDraftingUnit || record.mainDraftingUnit === 0 ? record.mainDraftingUnit : global.emptyLine }}</div>
+          </a-tooltip>
+        </template>
 
       </j-table>
     </div>
@@ -163,8 +170,7 @@ export default {
           title: this.$t('enterpriseStandardLibrary.reviewPlan.mainDraftingUnit'),
           align: 'center',
           width: 180,
-          dataIndex: 'mainDraftingUnit',
-          scopedSlots: { customRender: 'text' }
+          scopedSlots: { customRender: 'mainDraftingUnit' }
         }
       ],
       labelCol: {
diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
index 143f9462..25a59d4f 100644
--- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
+++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue
@@ -114,11 +114,20 @@
             </a-dropdown>
           </template>
 
-          <!--        详情-->
-          <template slot="detailClick" slot-scope="{text, record}">
+          <!--   企标编号  -->
+          <template v-slot:standard_no="{text, record}">
             <a-tooltip overlay-class-name="tooltip-style">
               <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-              <a class="table-text textName" @click="detailClick(record)" v-if="text || text === 0">{{ text }}</a>
+              <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="text || text === 0">{{ text }}</a>
+              <div class="table-text" v-else>{{ global.emptyLine }}</div>
+            </a-tooltip>
+          </template>
+
+          <!--   企标名称  -->
+          <template v-slot:standard_name="{text, record}">
+            <a-tooltip overlay-class-name="tooltip-style">
+              <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
+              <a class="table-text can-click-table-text" @click="detailClick(record)" v-if="text || text === 0">{{ text }}</a>
               <div class="table-text" v-else>{{ global.emptyLine }}</div>
             </a-tooltip>
           </template>
@@ -202,6 +211,7 @@ export default {
       loading: false,
       getTableHeaderFunc: getEnterpriseStandardTableHeader,
       getQueryConditionFunc: getEnterpriseStandardSearchForm,
+      tableSlotField: ['standard_no', 'standard_name'], // 表格中需要插槽的字段
       // url传参严格按照当前命名
       url: {
         list: '/laws/standard/enterprise/getCommonPage', // 表格数据
diff --git a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
index 7ddd9f4a..df411a05 100644
--- a/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
+++ b/src/views/enterpriseStandardLibrary/standard/modules/EnterpriseStandardModal.vue
@@ -12,7 +12,7 @@
     <a-spin :spinning="confirmLoading" style="width: 100%;height:100%">
       <div class="custom-drawer-style-scroll">
         <add-form ref="addForm"
-                  :defaultValue="{year_number: new Date().getFullYear()}"
+                  :defaultValue="{year_number: new Date().getFullYear() + ''}"
                   :disabledFieldList="['replaced_stand_num', 'referenced_standard']"
                   :get-form-func="getFormFunc"
                   :get-document-info-func="getDocumentInfoFunc"