去除一些前端打印代码，项目信息加提示

src/components/Breadcrumb/index.vue

@@ -58,8 +58,6 @@ export default {
         return cur
       }, [])
       for (const key in this.fakeList) {
-        console.log(key, '1')
-        console.log(this.levelList[this.levelList.length - 1].path, '2')
         if (key === this.levelList[this.levelList.length - 1].path) {
           this.levelList.splice(1, 0, this.fakeList[key])
         }

src/layout/components/TagsView/index.vue

@@ -72,7 +72,6 @@ export default {
   },
   methods: {
     setName(route) {
-      console.log('路由', route)
       if (route.path === '/contract/manage1/add' || route.path === '/contactsUnit/add' || route.path === '/projectInfo/addProject' || route.path === '/assetsInfo/add' || route.path === '/materialsInfo/add') {
         if (route.query.type === 'add') {
           return '新增' + route.title

src/utils/request.js

@@ -33,14 +33,13 @@ service.interceptors.request.use(config => {
     config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
   }
   // 参数发出前统一进行加密 白名单内的不进行加密
-  console.log(config)
+  // console.log(config)
 
   // if(config.data) {
   //   config.data = Qs.stringify(config.data, { arrayFormat: 'repeat' })
   // }
   return config
 }, error => {
-  console.log(error)
   Promise.reject(error)
 })
 // 响应拦截器

src/views/contactsUnit/add.vue

@@ -2,7 +2,7 @@
   <div class="contactsUnitAdd">
     <div class="addTitle">{{ $route.query.type === 'add' ? '新增往来单位'
       :$route.query.type === 'update' ? '修改往来单位'
-        :$route.query.type === 'details' ? '查看往来单位': '' }}</div>
+        :$route.query.type === 'checkDetails' ? '查看往来单位': '' }}</div>
     <el-form ref="form" inline :model="form" :disabled="$route.query.type === 'details'" label-width="auto" label-position="right">
       <div class="step-header">
         <div class="step-label">基本信息</div>
@@ -156,12 +156,12 @@ export default {
     }
   },
   created() {
-    if (this.$route.query.type === 'update' || this.$route.query.type === 'details') {
+    if (this.$route.query.type === 'update' || this.$route.query.type === 'checkDetails') {
       this.getDetail()
     }
   },
   beforeRouteLeave(to, from, next) {
-    if (this.agreeBack) { next() } else {
+    if (this.agreeBack || this.$route.query.type === 'checkDetails') { next() } else {
       if (JSON.stringify(this.form) !== JSON.stringify(this.saveForm)) {
         this.$confirm('您已经对信息进行了修改，离开后不会保存您所做的更改,是否确定离开?', '提示', {
           confirmButtonText: '确定',

src/views/contactsUnit/index.vue

@@ -107,7 +107,7 @@ export default {
       this.$router.push({
         path: '/contactsUnit/add',
         query: {
-          type: 'details',
+          type: 'checkDetails',
           data: row
         }
       })

src/views/projectInfo/addProject.vue

@@ -11,47 +11,47 @@
       <el-row>
         <el-col :span="12">
           <el-form-item v-if="number === '7'" label="基金主数据编码" prop="ZFUND">
-            <el-input v-model="form.ZFUND" clearable placeholder="请输入基金主数据编码" />
+            <el-input v-model.trim="form.ZFUND" clearable placeholder="请输入基金主数据编码" />
           </el-form-item>
           <el-form-item v-if="number === '7'" label="基金名称" prop="ZFUNDNAME">
-            <el-input v-model="form.ZFUNDNAME" clearable placeholder="请输入项目名称" />
+            <el-input v-model.trim="form.ZFUNDNAME" clearable placeholder="请输入项目名称" />
           </el-form-item>
 
           <el-form-item v-if="number !== '7'" label="项目主数据编码" prop="ZPROJECT">
-            <el-input v-model="form.ZPROJECT" clearable placeholder="请输入项目主数据编码" />
+            <el-input v-model.trim="form.ZPROJECT" clearable placeholder="请输入项目主数据编码" />
           </el-form-item>
           <el-form-item v-if="number !== '4' && number !== '7'" :label="number === '8' ? '租赁项目名称' : '项目名称'" prop="ZPROJNAME">
-            <el-input v-model="form.ZPROJNAME" clearable placeholder="请输入项目名称" />
+            <el-input v-model.trim="form.ZPROJNAME" clearable placeholder="请输入项目名称" />
           </el-form-item>
           <el-form-item v-if="number !== '6' && number !== '7' && number !== '8'" label="项目外文名称" prop="ZPROJENAME">
-            <el-input v-model="form.ZPROJENAME" clearable placeholder="请输入项目外文名称" />
+            <el-input v-model.trim="form.ZPROJENAME" clearable placeholder="请输入项目外文名称" />
           </el-form-item>
           <el-form-item v-if="number !== '8'" label="曾用名" prop="ZOLDNAME">
-            <el-input v-model="form.ZOLDNAME" clearable placeholder="请输入曾用名" />
+            <el-input v-model.trim="form.ZOLDNAME" clearable placeholder="请输入曾用名" />
           </el-form-item>
           <el-form-item v-if="number === '1' || number === '2'" label="所属事业部" prop="ZBIZDEPT">
-            <el-input v-model="form.ZBIZDEPT" clearable placeholder="请输入所属事业部" />
+            <el-input v-model.trim="form.ZBIZDEPT" maxlength="2" clearable placeholder="请输入所属事业部" />
           </el-form-item>
           <el-form-item v-if="number !== '5' && number !== '8'" label="项目所在地" prop="ZPROJLOC">
-            <el-input v-model="form.ZPROJLOC" clearable placeholder="请选择项目所在地" />
+            <el-input v-model.trim="form.ZPROJLOC" clearable placeholder="请选择项目所在地" />
           </el-form-item>
           <el-form-item v-if="number === '8'" label="项目所在地" prop="ZLOCATION">
-            <el-input v-model="form.ZLOCATION" clearable placeholder="请选择项目所在地" />
+            <el-input v-model.trim="form.ZLOCATION" clearable placeholder="请选择项目所在地" />
           </el-form-item>
 
           <el-form-item v-if="number === '2' || number === '3'" label="项目简称" prop="ZHEREINAFTER">
-            <el-input v-model="form.ZHEREINAFTER" clearable placeholder="请输入项目简称" />
+            <el-input v-model.trim="form.ZHEREINAFTER" clearable placeholder="请输入项目简称" />
           </el-form-item>
 
           <el-form-item v-if="number === '4'" label="项目工程名称" prop="ZENG">
-            <el-input v-model="form.ZENG" clearable placeholder="请输入项目工程名称" />
+            <el-input v-model.trim="form.ZENG" clearable placeholder="请输入项目工程名称" />
           </el-form-item>
 
           <el-form-item v-if="number === '4'" label="责任主体" prop="ZRESP">
-            <el-input v-model="form.ZRESP" clearable placeholder="请输入责任主体" />
+            <el-input v-model.trim="form.ZRESP" clearable placeholder="请输入责任主体" />
           </el-form-item>
           <el-form-item v-if="number === '4'" label="土地成交确认书编号" maxlength="50" prop="ZLDLOC">
-            <el-input v-model="form.ZLDLOC" clearable placeholder="请选择收入来源" />
+            <el-input v-model.trim="form.ZLDLOC" clearable placeholder="请选择收入来源" />
           </el-form-item>
 
           <el-form-item v-if="number === '5'" label="项目计划开始日期" prop="ZSTARTDATE">
@@ -65,33 +65,41 @@
           </el-form-item>
 
           <el-form-item v-if="number === '7'" label="基金编号" prop="ZFUNDNO">
-            <el-input v-model="form.ZFUNDNO" clearable placeholder="请输入基金编号" />
+            <el-input v-model.trim="form.ZFUNDNO" clearable placeholder="请输入基金编号" />
           </el-form-item>
           <el-form-item v-if="number === '7' || number === '8'" label="币种" prop="ZZCURRENCY">
-            <el-input v-model="form.ZZCURRENCY" clearable placeholder="币种" />
+            <el-input v-model.trim="form.ZZCURRENCY" clearable placeholder="币种" />
           </el-form-item>
 
           <el-form-item v-if="number === '6'" label="保险机构名称" prop="ZINSURANCE">
-            <el-input v-model="form.ZINSURANCE" clearable placeholder="请输入保险机构名称" />
+            <el-input v-model.trim="form.ZINSURANCE" clearable placeholder="请输入保险机构名称" />
           </el-form-item>
           <el-form-item v-if="number === '6'" label="保单号" prop="ZPOLICYNO">
-            <el-input v-model="form.ZPOLICYNO" clearable placeholder="请输入保单号" />
+            <el-input v-model.trim="form.ZPOLICYNO" clearable placeholder="请输入保单号" />
           </el-form-item>
 
           <el-form-item v-if="number === '8'" label="承租人名称 " prop="ZLESSEE">
-            <el-input v-model="form.ZLESSEE" clearable placeholder="请输入承租人名称" />
+            <el-input v-model.trim="form.ZLESSEE" clearable placeholder="请输入承租人名称" />
           </el-form-item>
           <el-form-item v-if="number === '8'" label="承租人类型 " prop="ZLESSEETYPE">
-            <el-input v-model="form.ZLESSEETYPE" clearable placeholder="承租人类型" />
+            <el-input v-model.trim="form.ZLESSEETYPE" clearable placeholder="承租人类型" />
           </el-form-item>
           <el-form-item label="项目类型" prop="ZPROJTYPE">
-            <el-input v-model="form.ZPROJTYPE" disabled clearable placeholder="请选择项目类型" />
+            <el-input v-model.trim="form.ZPROJTYPE" disabled clearable placeholder="请选择项目类型" />
           </el-form-item>
           <el-form-item label="国家/地区" prop="ZZCOUNTRY">
-            <el-input v-model="form.ZZCOUNTRY" clearable placeholder="请输入国家/地区" />
+            <el-input v-model="form.ZZCOUNTRY" style="width: 100%" clearable placeholder="请选择国家/地区"></el-input>
+            <!--<el-select v-model="form.ZZCOUNTRY" style="width: 100%" filterable clearable placeholder="请选择国家/地区">
+              <el-option
+                v-for="item in COUNTRYList"
+                :key="item.id"
+                :label="item.value"
+                :value="item.id"
+              />
+            </el-select>-->
           </el-form-item>
           <el-form-item v-if="number === '2' || number === '3'" label="项目组织形式" prop="ZPOS">
-            <el-input v-model="form.ZPOS" clearable placeholder="请输入项目组织形式" />
+            <el-input v-model.trim="form.ZPOS" clearable placeholder="请输入项目组织形式" />
           </el-form-item>
 
           <el-form-item v-if="number === '4'" label="工商变更时间" prop="ZCBR">
@@ -105,15 +113,15 @@
           </el-form-item>
 
           <el-form-item v-if="number === '7'" label="项目机构(基金管理人)" prop="ZPRO_BP">
-            <el-input v-model="form.ZPRO_BP" clearable placeholder="请输入项目机构（基金管理人）" />
+            <el-input v-model.trim="form.ZPRO_BP" clearable placeholder="请输入项目机构（基金管理人）" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="中交项目业务分类值域" prop="ZCPBC">
-            <el-input v-model="form.ZCPBC" clearable placeholder="请选择中交项目业务分类值域" />
+            <el-input v-model.trim="form.ZCPBC" clearable placeholder="请选择中交项目业务分类值域" />
           </el-form-item>
           <el-form-item label="所属二级单位" prop="Z2NDORG">
-            <el-input v-model="form.Z2NDORG" clearable placeholder="请输入所属二级单位" />
+            <el-input v-model.trim="form.Z2NDORG" clearable placeholder="请输入所属二级单位" />
           </el-form-item>
 
           <el-form-item v-if="number === '5'" label="项目计划完成日期" prop="ZFINDATE">
@@ -126,45 +134,45 @@
             />
           </el-form-item>
           <el-form-item v-if="number === '1'" label="收入来源" prop="ZSI">
-            <el-input v-model="form.ZSI" clearable placeholder="请选择收入来源" />
+            <el-input v-model.trim="form.ZSI" clearable placeholder="请选择收入来源" />
           </el-form-item>
           <el-form-item v-if="number !== '7'" label="项目机构" prop="ZPRO_ORG">
-            <el-input v-model="form.ZPRO_ORG" clearable placeholder="请输入项目机构" />
+            <el-input v-model.trim="form.ZPRO_ORG" clearable placeholder="请输入项目机构" />
           </el-form-item>
 
           <el-form-item v-if="number === '2' || number === '3'" label="中标主体" maxlength="20" prop="ZAWARDMAI">
-            <el-input v-model="form.ZAWARDMAI " clearable placeholder="请输入中标主体" />
+            <el-input v-model.trim="form.ZAWARDMAI " clearable placeholder="请输入中标主体" />
           </el-form-item>
 
           <el-form-item v-if="number === '4'" label="操盘情况" prop="ZTRADER">
-            <el-input v-model="form.ZTRADER" clearable placeholder="请选择操盘情况" />
+            <el-input v-model.trim="form.ZTRADER" clearable placeholder="请选择操盘情况" />
           </el-form-item>
           <el-form-item v-if="number === '4'" label="并表情况" maxlength="2" prop="ZCS">
-            <el-input v-model="form.ZCS" clearable placeholder="请输入并表情况" />
+            <el-input v-model.trim="form.ZCS" clearable placeholder="请输入并表情况" />
           </el-form-item>
 
           <el-form-item v-if="number === '6'" label="投保人" prop="ZINSURED">
-            <el-input v-model="form.ZINSURED" clearable placeholder="请输入投保人" />
+            <el-input v-model.trim="form.ZINSURED" clearable placeholder="请输入投保人" />
           </el-form-item>
 
           <el-form-item v-if="number === '7'" label="基金组织形式" prop="ZFUNDORGFORM">
-            <el-input v-model="form.ZFUNDORGFORM" clearable placeholder="请选择基金组织形式" />
+            <el-input v-model.trim="form.ZFUNDORGFORM" clearable placeholder="请选择基金组织形式" />
           </el-form-item>
           <el-form-item v-if="number === '7'" label="基金管理人类型" maxlength="500" prop="ZFUNDMTYPE">
-            <el-input v-model="form.ZFUNDMTYPE" clearable placeholder="请输入曾用名" />
+            <el-input v-model.trim="form.ZFUNDMTYPE" clearable placeholder="请输入曾用名" />
           </el-form-item>
 
           <el-form-item v-if="number === '8'" label="租赁物名称" prop="ZLEASESNAME">
-            <el-input v-model="form.ZLEASESNAME" clearable placeholder="请输入租赁物名称" />
+            <el-input v-model.trim="form.ZLEASESNAME" clearable placeholder="请输入租赁物名称" />
           </el-form-item>
           <el-form-item label="计税方式" prop="ZTAXMETHOD">
-            <el-input v-model="form.ZTAXMETHOD" maxlength="1" clearable placeholder="请输入计税方式" />
+            <el-input v-model.trim="form.ZTAXMETHOD" maxlength="1" clearable placeholder="请输入计税方式" />
           </el-form-item>
           <el-form-item v-if="number === '1'" label="投资主体" prop="ZINVERSTOR">
-            <el-input v-model="form.ZINVERSTOR" clearable placeholder="请输入投资主体" />
+            <el-input v-model.trim="form.ZINVERSTOR" clearable placeholder="请输入投资主体" />
           </el-form-item>
           <el-form-item v-if="number === '1' || number === '4'" label="项目批复/决议文号" prop="ZAPPROVAL">
-            <el-input v-model="form.ZAPPROVAL" clearable placeholder="请输入项目批复/决议文号" />
+            <el-input v-model.trim="form.ZAPPROVAL" clearable placeholder="请输入项目批复/决议文号" />
           </el-form-item>
           <el-form-item v-if="number === '1' || number === '4'" label="项目批复/决议时间" prop="ZAPVLDATE">
             <el-date-picker
@@ -177,7 +185,7 @@
           </el-form-item>
 
           <el-form-item v-if="number === '2' || number === '3' || number === '5'" label="上级项目主数据编码" prop="ZPROJECTUP">
-            <el-input v-model="form.ZPROJECTUP" clearable placeholder="请输入上级项目主数据编码" />
+            <el-input v-model.trim="form.ZPROJECTUP" clearable placeholder="请输入上级项目主数据编码" />
           </el-form-item>
           <el-form-item v-if="number !== '1' && number !== '4'" label="项目年份" prop="ZPROJYEAR">
             <el-date-picker
@@ -255,7 +263,7 @@
             />
           </el-form-item>
           <el-form-item v-if="number === '7'" label="托管人名称" maxlength="20" prop="ZCUSTODIAN">
-            <el-input v-model="form.ZCUSTODIAN" clearable placeholder="请输入托管人名称" />
+            <el-input v-model.trim="form.ZCUSTODIAN" clearable placeholder="请输入托管人名称" />
           </el-form-item>
 
           <el-form-item v-if="number === '8'" label="起租日期" prop="ZLEASEINCEPTION">
@@ -348,7 +356,7 @@ export default {
       },
       rules: {
         ZPROJECT: [
-          { required: true, message: '请输入基金主数据编码', trigger: 'blur' },
+          { required: true, message: '请输入项目主数据编码', trigger: 'blur' },
           { min: 1, max: 12, message: '长度在 1 到 12个字符', trigger: 'blur' }
         ],
         ZPROJNAME: [
@@ -501,7 +509,9 @@ export default {
         }
       },
       type: '',
-      number: this.$route.query.number
+      number: this.$route.query.number,
+      // 数据字典数据
+      COUNTRYList: [],
     }
   },
   created() {
@@ -773,11 +783,12 @@ export default {
     }
   },
   methods: {
-    /** 获取数据字典数据 */
+    /* /!** 获取数据字典数据 *!/
     getDictData() {
       dictData().then(res => {
+        this.COUNTRYList = res.data.ZCOUNTRY
       })
-    },
+    },*/
     /** 点击保存按钮操作 */
     addForm() {
       this.form.CREATEBY = JSON.parse(Store.get(storeKey.user)).userId
@@ -788,18 +799,24 @@ export default {
             projectAdd(formJson).then(res => {
               if (res.code === '200') {
                 this.agreeBack = true
+                this.$message.success('新增成功')
                 this.$router.push({
                   path: '/projectInfo/index'
                 })
+              } else {
+                this.$message.warning('新增失败')
               }
             })
           } else if (this.$route.query.type === 'update') {
             projectEdit(formJson).then(res => {
               if (res.code === '200') {
                 this.agreeBack = true
+                this.$message.success('修改成功')
                 this.$router.push({
                   path: '/projectInfo/index'
                 })
+              } else {
+                this.$message.warning('修改失败')
               }
             })
           }

src/views/projectInfo/index.vue

@@ -5,13 +5,13 @@
       <div style="flex: 1">
         <el-form ref="projectForm" inline :model="projectForm" label-position="left">
           <el-form-item label="项目类型">
-            <el-input v-model="projectForm.ZPROJTYPE"  clearable placeholder="请输入项目类型" />
+            <el-input v-model.trim="projectForm.ZPROJTYPE"  clearable placeholder="请输入项目类型" />
           </el-form-item>
           <el-form-item label="国家/地区">
-            <el-input v-model="projectForm.ZPRO_ORG" clearable placeholder="请输入国家/地区" />
+            <el-input v-model.trim="projectForm.ZZCOUNTRY" clearable placeholder="请输入国家/地区" />
           </el-form-item>
           <el-form-item label="中交项目业务分类值域">
-            <el-input v-model="projectForm.ZCPBC" clearable placeholder="请输入中交项目业务分类值域" />
+            <el-input v-model.trim="projectForm.ZCPBC" clearable placeholder="请输入中交项目业务分类值域" />
           </el-form-item>
           <el-form-item>
             <el-button type="primary" size="small" @click="queryProject">查询</el-button>