Merge branch 'dev' into vite

# Conflicts:
#	packages/IntelligentSecurity/AppISManage/AppISManage.vue
#	vue.config.js

project/xiushan/apps/financing/AppFinancingNeeds/needsDetail.vue

@@ -30,7 +30,12 @@
                   </el-row>
                 </el-form-item>
                 <el-form-item v-else/>
-                <el-form-item label="联系人">{{ detail.name }}</el-form-item>
+                <el-form-item label="联系人">
+                  <el-row type="flex">
+                    <div v-text="detail.name"/>
+                    <person-credit-report :person="detail" :instance="instance" :dict="dict"/>
+                  </el-row>
+                </el-form-item>
                 <el-form-item label="所在地区">{{ detail.areaName }}</el-form-item>
                 <el-form-item label="联系方式">{{ detail.phone }}</el-form-item>
                 <el-form-item label="身份证号">{{ detail.idNumber }}</el-form-item>
@@ -56,10 +61,11 @@
 <script>
 import {mapState} from "vuex";
 import EnterpriseDialog from "../../../components/enterpriseDialog";
+import PersonCreditReport from "../../../components/personCreditReport";
 
 export default {
   name: "needsDetail",
-  components: {EnterpriseDialog},
+  components: {PersonCreditReport, EnterpriseDialog},
   props: {
     instance: Function,
     dict: Object,

project/xiushan/apps/processManagement/approvalManage/components/approvalDetail.vue

@@ -221,9 +221,8 @@
                         :label="op.fieldName + (op.fieldNameSuffix ? op.fieldNameSuffix : '')" class="dynamicFormItem"
                         :prop="`fieldInfos.${i}.fieldValue`"
                         :rules="{required:op.mustFill==1,message:`请输入${op.fieldName}`}">
-            <el-input placeholder="请输入..." v-model.trim="op.fieldValue"
-                      clearable v-if="op.fieldDataType=='0'" oninput="value=value.replace(/[^\d]/g,'')" show-word-limit
-                      :maxlength="op.fieldLength"/>
+            <el-input placeholder="请输入..." v-model.number="op.fieldValue"
+                      clearable v-if="op.fieldDataType=='0'"  show-word-limit :maxlength="op.fieldLength"/>
 
             <el-input type="textarea" :rows="3" placeholder="请输入..." v-model.trim="op.fieldValue"
                       clearable v-if="op.fieldDataType=='1'" show-word-limit