Merge remote-tracking branch 'origin/branch20241月中旬'

This reverts commit 281c0b92b9.

public/production_address_config.js

@@ -10,25 +10,16 @@ window._CONFIG["domianWebSocketURL"] = "http://cwp.catarc.org.cn:8077/jero-boot"
 window._CONFIG["staticDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/download";
 window._CONFIG["pdfDomainURL"] = window._CONFIG["domianURL"] + "/sys/common/pdf/pdfPreviewIframe";
 window._CONFIG["casPrefixUrl"] = "http://cas.example.org:8443/cas";
-// TODO 暂时测试调整域名地址
 // 预览文件地址
-// window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/preview/onlinePreview";
+window._CONFIG["onlinePreviewDomainURL"] = "http://cwp.catarc.org.cn:8092/preview/onlinePreview";
-window._CONFIG["onlinePreviewDomainURL"] = "http://139.9.235.66:8012/onlinePreview";
 
 // 会议报名页面-报名二维码网址 -生成小程序二维码使用
-// window._CONFIG['singUpQRCodeURL'] = 'https://cwp.catarc.org.cn/signupentrance'
+window._CONFIG['singUpQRCodeURL'] = 'https://cwp.catarc.org.cn/signupentrance'
-window._CONFIG["singUpQRCodeURL"] = "https://bxxt.hzwlsoft.com/signupentrance"
 // 页面显示用的会议报名网址-pc端使用
-// window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance'
+window._CONFIG["singInQRCodHref"]= 'http://cwp.catarc.org.cn/signupentrance'
-window._CONFIG["singInQRCodHref"] = "https://bxxt.hzwlsoft.com/signupentrance"
 
 // 起草组报名页面-报名二维码网址 -生成小程序二维码使用
-// window._CONFIG['singUpDraftTeamQRCodeURL'] = 'https://cwp.catarc.org.cn/signupdraftteamentrance'
+window._CONFIG['singUpDraftTeamQRCodeURL'] = 'https://cwp.catarc.org.cn/signupdraftteamentrance'
-window._CONFIG['singUpDraftTeamQRCodeURL'] = 'https://bxxt.hzwlsoft.com/signupdraftteamentrance'
-
-// 起草组成员维护-企业端报名入口
-// window._CONFIG["singInDraftHref"]= 'http://cwp.catarc.org.cn/signupdraftteamentrance'
-window._CONFIG["singInDraftHref"]= 'https://bxxt.hzwlsoft.com/signupdraftteamentrance'
 
 // 路由转发 -会员系统的路由转发前缀
 window._CONFIG["memberURL"] = "/memberApi";

src/components/company/SelectContacts.vue

@@ -3,7 +3,23 @@
   <div>
     <a-row>
       <a-col :span="20">
+        <!-- 懒加载的下拉 -->
         <a-select :value="value"
+                  v-if="lazy"
+                  v-bind="$attrs"
+                  v-on="$listeners"
+                  show-search
+                  allowClear
+                  option-filter-prop="children"
+                  :filterOption="false"
+                  @search="lazySearch"
+                  @popupScroll="lazyPopupScroll"
+                  @dropdownVisibleChange="handleDropdownOpen">
+          <a-select-option v-for="item in lazyContactsList" :key="item.id" :value="item.id">{{ item.name }}</a-select-option>
+        </a-select>
+        <!-- 正常的下拉 -->
+        <a-select :value="value"
+                  v-else
                   v-bind="$attrs"
                   v-on="$listeners"
                   show-search
@@ -29,6 +45,7 @@
 <script>
 import ContactManagementModule from '@comp/company/ContactManagementModule'
 import {getContactsByCompany,getContactsByCompanyNoLimit} from '@api/incomePaymentsApi'
+import {debounce} from 'lodash'
 
 export default {
   name: 'SelectContacts',
@@ -72,11 +89,31 @@ export default {
       type: Boolean,
       required: false,
       default: false
+    },
+    // 懒加载（滚动到底部再渲染剩余数据）
+    lazy: {
+      type: Boolean,
+      require: false,
+      default: false
+    },
+    // 懒加载每次加载的个数
+    lazySize: {
+      type: Number,
+      require: false,
+      default: 50
+    },
+    // 没有企业id（companyId）就不进行搜索
+    notCompanyIdCancelSearch: {
+      type: Boolean,
+      require: false,
+      default: false
     }
   },
   data() {
     return {
       contactsList: [], // 该企业下联系人列表
+      lazyContactsList: [], // 该企业下联系人列表 (懒加载)
+      searchContactsList: [], // 搜索的全下拉 (懒加载)
       isFirstOpen: true, // 编辑状态下是否为第一次打开
       contactId: this.value
     }
@@ -84,6 +121,8 @@ export default {
   created() {
     // this.initContacts = null
     this.contactsList = []
+    this.lazyContactsList  = []
+    this.searchContactsList = []
     // 编辑 第一次不回显的问题
     this.getContactsList()
   },
@@ -115,6 +154,39 @@ export default {
     }
   },
   methods: {
+    // 懒加载搜索
+    lazySearch (val) {
+      // 搜索后就只需要一直从searchContactsList里取懒加载的部分数据
+      if (val) {
+        this.searchContactsList = this.contactsList.filter(item => item.name.includes(val))
+      } else {
+        this.searchContactsList = this.contactsList
+      }
+      // 显示部分搜索结果
+      this.lazyContactsList = this.searchContactsList.slice(0, this.lazySize)
+    },
+    // 懒加载滚动
+    lazyPopupScroll: debounce(function (e) {
+      console.log('scroll')
+      const { target } = e
+      const scrollHeight = target.scrollHeight - target.scrollTop
+      const clientHeight = target.clientHeight
+      // 下拉框不下拉的时候
+      if (scrollHeight === 0 && clientHeight === 0) {
+        this.lazyContactsList = []
+      } else {
+        // 当下拉框滚动条到达底部的时候
+        if (scrollHeight < clientHeight + 5) {
+          console.log('scroll end')
+          const allLen = this.searchContactsList.length
+          const showLen = this.lazyContactsList.length
+          // 如果总长度大于显示长度，那就添加
+          if (allLen > showLen) {
+            this.lazyContactsList = this.searchContactsList.slice(0, showLen + this.lazySize)
+          }
+        }
+      }
+    }, 50),
     /**
      * 获取联系人数据
      */
@@ -125,12 +197,23 @@ export default {
       } else {
         params.companyId = null
       }
+      // 如果没有id就不调用接口
+      if (this.notCompanyIdCancelSearch && !params.companyId) return
       // 是否调用无权限接口
       if (this.isLimit) {
         // 调用无权限接口
         return new Promise(resolve => {
           getContactsByCompanyNoLimit(params).then(res => {
             this.contactsList = res.result
+            if (this.lazy) {
+              // 完整的所有下拉，回显的用户显示再最前面
+              const findIndex = this.contactsList.findIndex(item => item.id === this.value)
+              this.contactsList.unshift(this.contactsList.splice(findIndex, 1)[0])
+              // 搜索的所有下拉
+              this.searchContactsList = this.contactsList
+              // 显示的所有下拉
+              this.lazyContactsList = this.contactsList.slice(0, this.lazySize)
+            }
             if (this.initContacts && this.initContacts.id) {
               this.contactsList.push(this.initContacts)
             }
@@ -141,6 +224,15 @@ export default {
         return new Promise(resolve => {
           getContactsByCompany(params).then(res => {
             this.contactsList = res.result || []
+            if (this.lazy) {
+              // 完整的所有下拉，回显的用户显示再最前面
+              const findIndex = this.contactsList.findIndex(item => item.id === this.value)
+              this.contactsList.unshift(this.contactsList.splice(findIndex, 1)[0])
+              // 搜索的所有下拉
+              this.searchContactsList = this.contactsList
+              // 显示的所有下拉
+              this.lazyContactsList = this.contactsList.slice(0, this.lazySize)
+            }
             if (this.initContacts && this.initContacts.id) {
               this.contactsList.push(this.initContacts)
             }

src/components/iconfont/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "anticon-jeecg"; /* Project id 2798517 */
-  src: url('iconfont.woff2?t=1631613073967') format('woff2'),
+  src: url('iconfont.woff2?t=1705570227820') format('woff2'),
-       url('iconfont.woff?t=1631613073967') format('woff'),
+       url('iconfont.woff?t=1705570227820') format('woff'),
-       url('iconfont.ttf?t=1631613073967') format('truetype');
+       url('iconfont.ttf?t=1705570227820') format('truetype');
 }
 
 .anticon-jeecg {
@@ -13,6 +13,30 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.anticondraftgroup:before {
+  content: "\e65e";
+}
+
+.anticonothermeeting:before {
+  content: "\e621";
+}
+
+.anticonworking:before {
+  content: "\e61f";
+}
+
+.anticoninternational:before {
+  content: "\e61e";
+}
+
+.anticondatamembers:before {
+  content: "\e61d";
+}
+
+.anticoncommittee:before {
+  content: "\e613";
+}
+
 .anticonmeeting:before {
   content: "\e60f";
 }

src/components/iconfont/iconfont.json

@@ -5,6 +5,48 @@
   "css_prefix_text": "anticon",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "3009589",
+      "name": "cus_draftgroup",
+      "font_class": "gongzuopai",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "26512409",
+      "name": "cue_othermeeting",
+      "font_class": "othermeeting",
+      "unicode": "e621",
+      "unicode_decimal": 58913
+    },
+    {
+      "icon_id": "26512248",
+      "name": "cus_working",
+      "font_class": "working",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "26512241",
+      "name": "cus_international",
+      "font_class": "international",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "26512231",
+      "name": "cus_datamembers",
+      "font_class": "datamembers",
+      "unicode": "e61d",
+      "unicode_decimal": 58909
+    },
+    {
+      "icon_id": "26511116",
+      "name": "cus_committee",
+      "font_class": "committee",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
     {
       "icon_id": "24340808",
       "name": "cus_meeting",

src/components/menu/SideMenu.vue

@@ -175,11 +175,5 @@ export default {
     }
   }
 }
-// icon图片默认是选中的图片，如果没被选中，就设置灰掉
-.ant-menu-item:not(.ant-menu-item-selected) {
-  .icon-img {
-    filter: grayscale(100%);
-  }
-}
 </style>
 <!-- update_end author:sunjianlei date:20190530 for: 选中首页的时候不显示背景颜色 -->

src/components/menu/index.js

@@ -147,13 +147,6 @@ export default {
       )
     },
     renderIcon (icon) {
-      // 图片做菜单icon，cus_img_xxx.png, xxx-act.png放在assets/imgs/icon/
-      // (act是激活后的图片，未激活时通过样式置灰)
-      if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_img_') !== -1) {
-        const img = require('@/assets/imgs/icon/' + icon.substr(8) + '_act.png')
-        return (<img style="width:16px;height:16px;user-select:none;margin-right:8px;vertical-align:sub;"
-                     src={img} alt="" class="icon-img"/>)
-      }
       if (icon !== 'none' && icon !== undefined && icon.indexOf('cus_') !== -1) {
         let className = `anticon-jeecg anticon${icon.substr(4)}`
         return <i class={className} style='margin-right: 8px'></i>

src/components/page/GlobalLayout.vue

@@ -696,4 +696,11 @@ body {
     }
   }
 }
+
+// 自定义图标收小隐藏文字
+.ant-menu-inline-collapsed {
+  .anticon-jeecg + span {
+    opacity: 0!important;
+  }
+}
 </style>

src/components/tools/Logo.vue

@@ -3,8 +3,8 @@
     <router-link :to="{name:'dashboard'}">
 
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
-      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo">
+      <img v-if="navTheme === 'dark'" src="~@/assets/logo.png" alt="logo" :class='smallImg ? "smallImg": ""'>
-      <img v-else src="~@/assets/logo.png" alt="logo">
+      <img v-else src="~@/assets/logo.png" alt="logo" :class='smallImg ? "smallImg": ""'>
       <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
 
       <h1 v-if="showTitle">{{ title }}</h1>
@@ -29,6 +29,16 @@
         default: true,
         required: false
       }
+    },
+    data() {
+      return {
+        smallImg: false
+      }
+    },
+    watch: {
+      sidebarOpened(val) {
+        this.smallImg = !val
+      }
     }
   }
 </script>
@@ -55,5 +65,8 @@
     &.light .logo {
       background-color: @primary-color;
     }
+    .smallImg {
+      height: 16px;
+    }
   }
 </style>

src/config/router.config.js

@@ -139,7 +139,7 @@ export const routerData = [
     component: 'draftTeam/DraftTeam',
     route: '1',
     meta: {
-      icon: 'cus_img_icon_drafting_group', // 菜单前图标
+      icon: 'cus_draftgroup', // 菜单前图标
       componentName: 'DraftTeam',
       keepAlive: false,
       title: '起草组' // 菜单名称

src/views/MessagePage/PaymentVoucher.vue

@@ -13,7 +13,7 @@
             </a-tooltip>
           </a-col>
           <a-col :xl="6" :lg="8" :md="8" :sm="24">
-            <span>应付金额：{{ receivableAmount }}元</span>
+            <span>应付金额：{{ receivableAmount || '0' }}元</span>
           </a-col>
           <a-col :xl="6" :lg="8" :md="8" :sm="24">
             <span>已付金额：{{ paidAmount || '0' }}元</span>

src/views/MessagePage/ProjectDetailModal.vue

@@ -26,11 +26,11 @@
           </a-col>
           <a-col :span="12" class="detail-item">
             <label>应付金额：</label>
-            <span><j-ellipsis :value="`${basicInfo.receivableAmount}元`" :length="20"></j-ellipsis></span>
+            <span><j-ellipsis v-if="basicInfo.receivableAmount || basicInfo.receivableAmount === 0" :value="`${basicInfo.receivableAmount}元`" :length="20"></j-ellipsis></span>
           </a-col>
           <a-col :span="12" class="detail-item">
             <label>实付金额：</label>
-            <span><j-ellipsis :value="`${basicInfo.paidAmount}元`" :length="20"></j-ellipsis></span>
+            <span><j-ellipsis v-if="basicInfo.paidAmount || basicInfo.paidAmount === 0" :value="`${basicInfo.paidAmount}元`" :length="20"></j-ellipsis></span>
           </a-col>
           <a-col :span="12" class="detail-item">
             <label>打包：</label>

src/views/draftTeam/SignUpDraftTeamEntrance.vue

@@ -97,8 +97,8 @@ export default {
     })
   },
   async mounted() {
-    // let codeUrl = `${ window._CONFIG['singUpDraftTeamQRCodeURL'] }?id=${this.$route.query.id}`
+    let codeUrl = `${ window._CONFIG['singUpDraftTeamQRCodeURL'] }?id=${this.$route.query.id}`
-    let codeUrl = `${ window._CONFIG['singUpDraftTeamQRCodeURL'] }?id=1746776208124739585`
+    // let codeUrl = `${ window._CONFIG['singUpDraftTeamQRCodeURL'] }?id=1746776208124739585`
     this.singUpQRCode = await this.generateQRCode(codeUrl)
   },
   methods: {

src/views/draftTeam/SignUpDraftTeamPage.vue

@@ -87,6 +87,7 @@
                                      v-decorator="[`payDraftingGroupSubItemContactsList[${index}].contactsId`, {rules: [{ required: index === 0, validator: index === 0 ? validateContactRequired : validateContact }],validateTrigger: 'change'}]"
                                      :maxLength='50'
                                      isLimit
+                                     not-company-id-cancel-search
                                      :ref="`selectContacts${index}`"></select-contacts>
                   </a-form-item>
                 </a-col>

src/views/signUp/SignUpPage.vue

@@ -151,6 +151,7 @@
                                      :is-limit="true"
                                      v-decorator="['companyContactId',validatorRules.companyContactId]"
                                      :maxLength='50'
+                                     notCompanyIdCancelSearch
                                      @change="changeContact"
                                      ref="selectMailContacts"
                                      @ok="addContactsOk"></select-contacts>

src/views/standardsAssociation/ApprovalDocumentNumberList.vue

@@ -152,7 +152,7 @@ export default {
         sm: {span: 10}
       },
       url: {
-        list: '/approvalDocumentNumber/approvalDocumentNumber/list',
+        list: '/approvalDocumentNumber/approvalDocumentNumber/listByCompany',
       },
 
     }