Merge branch 'dev1.0' of http://192.168.0.200:3000/suf/factoring-trade-front-end-v2 into dev1.0

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/Auditing.vue

@@ -414,7 +414,7 @@ export default {
           postData.projectCoreEnterpriseNewsList = projectOwnerNewsList
         }
 
-        if (submitType === 'submit') {
+        if (submitType === 'submit' || submitType === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(postData)

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

@@ -80,7 +80,7 @@ export default {
     passData(submitType) {
       console.log(submitType, 888)
       return new Promise((resolve, reject) => {
-        if (submitType === 'submit') {
+        if (submitType === 'submit' || submitType === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(this.ruleForm)

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

@@ -204,7 +204,7 @@ export default {
         projectCoreEnterpriseFiles
       }
       return new Promise((resolve, reject) => {
-        if (submitType === 'submit') {
+        if (submitType === 'submit' || submitType === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(projectCoreEnterprise)

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

@@ -130,9 +130,10 @@ export default {
               let errorStr = ''
               if (res.data.errors.length) {
                 res.data.errors.map(item => {
-                  errorStr += item
-                })
-                this.$message.warning({ message: errorStr, duration: 3500 })
+                  errorStr += item + '!'
+                })
+                const msg = errorStr.substring(0, errorStr.length - 1)
+                this.$message.warning({ message: msg, duration: 3500 })
               }
             } else {
               this.$message.success('评估成功')

src/views/creditManage/projectCredit/dueReview/components/Project/Cooperation.vue

@@ -99,7 +99,7 @@ export default {
     // 提交参数
     passData(type) {
       return new Promise((resolve, reject) => {
-        if (type === 'submit') {
+        if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(this.ruleForm)

src/views/creditManage/projectCredit/dueReview/components/Project/ProjectInfo.vue

@@ -355,7 +355,7 @@ export default {
       delete params.biddingFiles
       delete params.departmentFiles
       return new Promise((resolve, reject) => {
-        if (type === 'submit') {
+        if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (this.ruleForm.projectType === 'c_project_type_1') {
               if (!biddingFile.length) {

src/views/creditManage/projectCredit/dueReview/components/Project/ProjectOwner.vue

@@ -453,7 +453,7 @@ export default {
           })
           postData.projectOwnerNewsList = projectOwnerNewsList
         }
-        if (type === 'submit') {
+        if (type === 'submit' || type === 'assess') {
           this.$refs.ruleFormRef.validate(valid => {
             if (valid) {
               return resolve(postData)

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

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

src/views/creditManage/supplierManage/auditingTwo/auditingTwoMain.vue

@@ -104,19 +104,19 @@ export default {
         this.$message.warning('请选择经营范围是否达标')
         return
       }
-      if (mapFilesCompliance === undefined || !mapFilesCompliance) {
+      if (mapFilesCompliance === undefined) {
         this.$message.warning('请选择地点定位图是否达标')
         return
-      }
-      if (rentalFilesCompliance === undefined || !rentalFilesCompliance) {
+      }  
+      if (rentalFilesCompliance === undefined) {
         this.$message.warning('请选择租房合同是否达标')
         return
       }
-      if (waterFilesCompliance === undefined || !waterFilesCompliance) {
+      if (waterFilesCompliance === undefined) {
         this.$message.warning('请选择房费缴纳流水是否达标')
         return
       }
-      if (officeFilesCompliance === undefined || !officeFilesCompliance) {
+      if (officeFilesCompliance === undefined) {
         this.$message.warning('请选择办公环境是否达标')
         return
       }

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
         },
         {