diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/util.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/util.js index f921c8f8..67255e11 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/util.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/util/util.js @@ -143,5 +143,17 @@ const getDeviceType = () =>{ return 'unknown'; } } - -export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTimeWithoutSecond,formattedTime,getDeviceType,formattedDate,alignNames}; +/** + * 解析执法人员字符串,拆分名字和电话/证件号 + * @param {string} str - 如 "陈碧祺 178****7511" + * @returns {Object} { name: '陈碧祺', phone: '178****7511' } + */ +const parseEnforcer = (str) => { + if (!str) return { name: '', phone: '' }; + const match = str.trim().match(/^(.+?)\s+(\S+)$/); + if (match) { + return { name: match[1], phone: match[2] }; + } + return { name: str.trim(), phone: '' }; +}; +export { setGoodsNum, isObject, comparisonObject, isElementHidden ,formattedTimeYYYYmmdd,formattedTimeWithoutSecond,formattedTime,getDeviceType,formattedDate,alignNames,parseEnforcer}; diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue index e69164f5..382f0678 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluate.vue @@ -66,10 +66,10 @@ 执法人员
- {{ item.lawEnforcer }}{{ item.lawEnforcerId }} + {{ item.lawEnforcer }}
-
- {{ item.lawEnforcerTwo }}{{ item.lawEnforcerIdTwo }} +
+ {{ enforcer }}
@@ -155,6 +155,7 @@ const mapEvaluateItem = (item) => ({ lawEnforcerTwo: item.lawEnforcerTwo || '', lawEnforcerIdTwo: item.lawEnforcerIdTwo || '', enforcers: parseEnforcers(item), + lawEnforcer2List: item.lawEnforcer2List || [], raw: item }); diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue index b185aa91..c6218c8c 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue @@ -28,10 +28,8 @@
执法人员
-
- {{ person.name }} - {{ person.phone }} -
+
{{ detail.lawEnforcer }}
+
{{ enforcer }}
@@ -63,7 +61,7 @@ 委托行政机关 {{ detail.entrustDeptName }}
--> -
+
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue index c337627c..c7fbf8cf 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue @@ -26,7 +26,8 @@
执法人员: -
{{ enforcer }}
+
{{ item.lawEnforcer }}
+
{{ enforcer }}