fix(冲突):合分支冲突

public/UEditor/ueditor.all.min.js

@@ -8024,9 +8024,10 @@ var fillCharReg = new RegExp(domUtils.fillChar, 'g');
                 serverUrl = imageUrl.replace(/^(.*[\/]).+([\.].+)$/, '$1controller$2');
             }
             if (actionName == 'uploadimage' || actionName == 'uploadscrawl' || actionName == 'listfile' || actionName =='uploadfile') {
-                const url = serverUrl;
-                const domain = url.split('/').slice(0, 3).join('/');
-                return domain + '/fileStorage/imgUpload';
+                // const url = serverUrl;
+                // console.log(this.getOpt('uploadUrl'))
+                // const domain = url.split('/').slice(0, 3).join('/');
+                return this.getOpt('uploadUrl');
             }
             if(serverUrl) {
                 serverUrl = serverUrl + (serverUrl.indexOf('?') == -1 ? '?':'&') + 'action=' + (actionName || '');

src/components/UnifiedEditor/index.vue

@@ -219,10 +219,11 @@ export default {
         imageInsertAlign: 'none',
         imageMaxSize: 20480000,
         // 访问 UEditor 静态资源的根路径，可参考 https://hc199421.gitee.io/vue-ueditor-wrap/#/faq
-        UEDITOR_HOME_URL: '/UEditor/',
+        UEDITOR_HOME_URL: process.env.NODE_ENV === 'development' ? '/UEditor/' : `/factoring-trade/UEditor/`,
         // 服务端接口（这个地址是我为了方便各位体验文件上传功能搭建的临时接口，请勿在生产环境使用！！！）
         // serverUrl: 'https://ueditor.zhenghaochuan.com/cos',
-        serverUrl: `${process.env.VUE_APP_BASE_API}/fileStorage/getUeconfig`
+        serverUrl: process.env.NODE_ENV === 'development' ? `${process.env.VUE_APP_BASE_API}/fileStorage/getUeconfig` : '/tradeV4-backend/fileStorage/getUeconfig',
+        uploadUrl: process.env.NODE_ENV === 'development' ? `${process.env.VUE_APP_BASE_API}/fileStorage/imgUpload` : '/tradeV4-backend/fileStorage/imgUpload'
         // headers: {
         //   Authorization: '',
         //   tenantId: ''
@@ -251,6 +252,9 @@ export default {
       deep: true
     }
   },
+  mounted() {
+    console.log(process.env.NODE_ENV === 'development')
+  },
   methods: {
     getUEContent() {
       return this.ueditor

src/components/Upload/index.vue

@@ -472,9 +472,9 @@ export default {
 </script>
 
 <style lang="scss">
-.cy-upload-content .el-upload-list  {
-  margin-top: -42px;
-}
+// .cy-upload-content .el-upload-list  {
+//   margin-top: -42px;
+// }
 
 .cy-upload {
   width: 100%;

src/views/creditManage/projectCredit/dueReview/components/Company/index.vue

@@ -130,7 +130,7 @@ export default {
               let errorStr = ''
               if (res.data.errors.length) {
                 res.data.errors.map(item => {
-                  errorStr += item + ';'
+                  errorStr += item + '!'
                 })
                 const msg = errorStr.substring(0, errorStr.length - 1)
                 this.$message.warning({ message: msg, duration: 3500 })

src/views/creditManage/supplierManage/auditing/components/MainEnterprise.vue

@@ -163,7 +163,7 @@ export default {
               defaultDesc='请上传附件'
             />
           }
-        },
+        },   
         {
           label: '征信报告',
           prop: 'inDate',

src/views/financialManagement/addAccounts.vue

@@ -7,10 +7,10 @@
     </div> -->
     <div slot="bottom">
       <div class="tempalte-content" style="min-height: auto; padding: 0px 20px ">
-        <!-- 入账 -->
-        <add-accounts-content v-if="settleType === '1'" ref="addAccountsContent" :disabled="disabled" />
         <!-- 出账 -->
         <edit-exit-account v-if="settleType === '2'" ref="exitAccountsContent" :disabled="disabled"></edit-exit-account>
+        <!-- 入账 -->
+        <add-accounts-content v-else ref="addAccountsContent" :disabled="disabled" />
         <div v-if="!disabled" class="submit-btn">
           <el-button style="width: 150px;" @click="() => { $router.go(-1) }">取消</el-button>
           <el-button style="width: 150px;" type="primary" @click="onSubmit">确定</el-button>
@@ -45,12 +45,7 @@ export default {
   },
   methods: {
     onSubmit() {
-      if (this.settleType === '1') {
-        this.submitEntryFinance()
-      }
-      // if (this.settleType === '2') {
-      //   this.submitExitFinance()
-      // }
+      this.submitEntryFinance()
     },
     // 提交入账
     submitEntryFinance() {

src/views/financialManagement/components/EditExitAccount.vue

@@ -1,6 +1,7 @@
 <template>
   <div class="add-accounts-content">
-    <el-form ref="ruleForm" :key="key" :model="ruleForm" :rules="rules" label-width="150px" label-position="top" class="rule-form-orange">
+    <!-- :rules="rules" -->
+    <el-form ref="ruleForm" :key="key" :model="ruleForm" label-width="150px" label-position="top" class="rule-form-orange">
       <cy-info-title>出账信息</cy-info-title>
       <el-form-item label="核心企业名称" prop="customerName">
         <el-input

src/views/financingManage/index.vue

@@ -128,11 +128,14 @@ export default {
         {
           label: '执行人',
           prop: 'executor',
-          showTooltip: true
+          showTooltip: true,
+          render: (h, row) => {
+            return <div>{this.activeName === 'all' ? row.assignee.name : row.executor}</div>
+          }
         },
         {
           label: '状态',
-          prop: 'financingStatus',
+          prop: 'statusStr',
           showTooltip: true
         },
         {