2 Komitmen 71dc34dccc ... bde1aa7713

Pembuat SHA1 Pesan Tanggal
  徐滕 bde1aa7713 Merge remote-tracking branch 'origin/master' 1 Minggu lalu
  徐滕 347748bbdb 客户列表页面展示信息调整,报销导入数电票验证优化 1 Minggu lalu

+ 8 - 4
src/views/common/NewDigitalInvoiceUploadComponent.vue

@@ -796,13 +796,17 @@ export default {
 
 				// 如果没有找到匹配的字段,抛出错误
 				if (matchedKeys.length === 0) {
-					throw new Error(`未找到发票字段: ${field},请核对XML文件`)
+					if(!field.includes("UndefinedLabel")){
+						throw new Error(`未找到发票字段: ${field},请核对XML文件`)
+					}
 				}
 				// 替换属性名
 				for (let key of matchedKeys) {
-					if (key !== field) {
-						obj[field] = obj[key];
-						delete obj[key];
+					if(!field.includes("UndefinedLabel")) {
+						if (key !== field) {
+							obj[field] = obj[key];
+							delete obj[key];
+						}
 					}
 				}
 

+ 4 - 4
src/views/cw/workClientInfo/WorkClientList.vue

@@ -139,21 +139,21 @@
               {{$dictUtils.getDictLabel('cw_work_client_industry', scope.row.industry, '-')}}
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="是否上市" field="cwWorkClientTypeDTO.isListed">
+<!--          <vxe-column min-width="160" align="center" title="是否上市" field="cwWorkClientTypeDTO.isListed">
             <template #default="scope">
               {{$dictUtils.getDictLabel('yes_no', scope.row.cwWorkClientTypeDTO.isListed, '-')}}
             </template>
-          </vxe-column>
+          </vxe-column>-->
           <vxe-column min-width="160" align="center" title="企业隶属关系划分" field="affiliation">
             <template #default="scope">
               {{$dictUtils.getDictLabel('cw_work_client_affiliation', scope.row.affiliation, '-')}}
             </template>
           </vxe-column>
-          <vxe-column min-width="160" align="center" title="按所有制性质分类" field="cwWorkClientTypeDTO.ownershipType">
+<!--          <vxe-column min-width="160" align="center" title="按所有制性质分类" field="cwWorkClientTypeDTO.ownershipType">
             <template #default="scope">
               {{$dictUtils.getDictLabel('cw_work_client_ownership_type', scope.row.cwWorkClientTypeDTO.ownershipType, '-')}}
             </template>
-          </vxe-column>
+          </vxe-column>-->
           <vxe-column min-width="160" align="center" title="按最终地位分类" field="cwWorkClientTypeDTO.finalStatusType"></vxe-column>
 <!--          <vxe-column min-width="160" align="center" title="客户报备类型" field="reportType">-->
 <!--            <template #default="scope">-->