From 43f038b5f7ad70d38139b8e21939372b631e8fb3 Mon Sep 17 00:00:00 2001
From: guoxing <1369478551@qq.com>
Date: Wed, 18 Oct 2023 17:15:05 +0800
Subject: [PATCH] 2023-10-18

---
 supervise-crm-ui/src/api/dataDict/datadict.js |   59 +-
 supervise-crm-ui/src/api/portal/Upload.js     |   30 +
 supervise-crm-ui/src/api/project/project.js   |   58 +-
 .../uploadFile/upload_yanchejianchaTuBiao.vue |  384 ++---
 .../src/router/modules/codemenu.js            |   53 +-
 supervise-crm-ui/src/views/project/index.vue  |   13 +-
 .../src/views/project/projectAdd.vue          |    2 +-
 .../src/views/project/projectAdd2.vue         | 1422 +++++++++++++++++
 .../src/views/project/projectInfo2.vue        |  383 +++++
 .../src/views/projectSet/WechatPush/index.vue |  513 ++++++
 .../views/projectSet/industry/industryAdd.vue |  172 ++
 .../projectSet/industry/industryInfo.vue      |  238 +++
 .../views/projectSet/projectStaff/index.vue   |  434 +++++
 .../projectState/projectStateAdd.vue          |  172 ++
 .../projectState/projectStateInfo.vue         |  237 +++
 .../projectSet/projectType/projectTypeAdd.vue |  173 ++
 .../projectType/projectTypeInfo.vue           |  225 +++
 17 files changed, 4359 insertions(+), 209 deletions(-)
 create mode 100644 supervise-crm-ui/src/api/portal/Upload.js
 create mode 100644 supervise-crm-ui/src/views/project/projectAdd2.vue
 create mode 100644 supervise-crm-ui/src/views/project/projectInfo2.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/WechatPush/index.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/industry/industryAdd.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/industry/industryInfo.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/projectStaff/index.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/projectState/projectStateAdd.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/projectState/projectStateInfo.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/projectType/projectTypeAdd.vue
 create mode 100644 supervise-crm-ui/src/views/projectSet/projectType/projectTypeInfo.vue

diff --git a/supervise-crm-ui/src/api/dataDict/datadict.js b/supervise-crm-ui/src/api/dataDict/datadict.js
index 95fe6a1c..e3c9c01f 100644
--- a/supervise-crm-ui/src/api/dataDict/datadict.js
+++ b/supervise-crm-ui/src/api/dataDict/datadict.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export default {
   // 11111111111111111111111
-  
+
   // 行业品类 分类列表
   industryListPage: function(params) {
     return request({
@@ -111,4 +111,61 @@ export default {
     })
   },
 
+
+
+  // 状态 分类列表
+  projectstatedListPage: function(params) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/projectstatedictionary/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+  // 行业品类 通过sid删除一条或多条记录
+  projectstatedDelBySids: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/projectstatedictionary/delete/' + sid,
+      method: 'delete'
+    })
+  },
+  //  新增、保存状态
+  saveprojectstated: function(params) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/projectstatedictionary/save',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 行业品类 修改行业品类
+  updateprojectstated: function(params) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/projectstatedictionary/update',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  // 行业品类 通过sid查询一条记录
+  projectstatedBySid: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/projectstatedictionary/getProjectStateBySid/' + sid
+    })
+  },
+
+
 }
diff --git a/supervise-crm-ui/src/api/portal/Upload.js b/supervise-crm-ui/src/api/portal/Upload.js
new file mode 100644
index 00000000..0a5d1ebe
--- /dev/null
+++ b/supervise-crm-ui/src/api/portal/Upload.js
@@ -0,0 +1,30 @@
+import request from '@/utils/request'
+import qs from 'qs'
+// 统一请求路径前缀
+const base = process.env.VUE_APP_URL
+
+// 文件上传接口
+export const uploadFile = '/api/customer/file/upload'
+// export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload'
+
+
+
+// 上传图片
+// export function imageUpload(data) {
+// 	return request({
+// 		url: '/portal/file/upload',
+// 		method: 'post',
+// 		data,
+// 		headers: { 'Content-Type': 'multipart/form-data' }
+// 	})
+// }
+
+// 移除图片
+export function deleteFilesOss(data) {
+	return request({
+		url: '/base/v1/baseVehicleAppendixs/deleteFilesOss',
+		method: 'post',
+    data: qs.stringify(data),
+		// headers: { 'Content-Type': 'multipart/form-data' }
+	})
+}
diff --git a/supervise-crm-ui/src/api/project/project.js b/supervise-crm-ui/src/api/project/project.js
index 0cc08e3a..4481650c 100644
--- a/supervise-crm-ui/src/api/project/project.js
+++ b/supervise-crm-ui/src/api/project/project.js
@@ -26,6 +26,16 @@ export default {
     })
   },
 
+  // 获取贷款行
+  getUserListByOrg: function() {
+    return request({
+        baseURL: '/api/portal',
+      url: '/v1/sysorganization/getUserListByOrg/100',
+      method: 'get',
+    })
+  },
+
+
   // 获取项目单位
   getEnterpriseinformation: function(data) {
     return request({
@@ -58,6 +68,26 @@ export default {
     })
   },
 
+  // 获取 状态字典信息
+  getProjtypedstated: function(data) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/projectstatedictionary/listAll',
+      data,
+      method: 'get',
+      params: data,
+    })
+  },
+
+  saveInfo: function(data) {
+    return request({
+      baseURL: "/api/crm",
+      url: '/v1/projectinformation/save',
+      method: 'post',
+      data: data
+    });
+  },
+
   addInfo: function(data) {
     return request({
       baseURL: "/api/crm",
@@ -74,6 +104,14 @@ export default {
     })
   },
 
+
+  getInfoBySid: function(sid) {
+    return request({
+      baseURL: '/api/crm',
+      url: '/v1/projectinformation/getProjectBySid/' + sid
+    })
+  },
+
   updateData: function(data) {
     return request({
       baseURL: "/api/crm",
@@ -89,7 +127,7 @@ export default {
       method: 'get',
     });
   },
-  
+
   delBySids: function(sid) {
     return request({
       baseURL: '/api/crm',
@@ -99,13 +137,13 @@ export default {
   },
   getStorehouseBySid: function(sid) {
     return request({
-      url: '/crm/v1/projectinformation/getStorehouseBySid/'+ sid,
+      url: '/crm/v1/projectinformation/getStorehouseBySid/' + sid,
       method: 'get'
     })
   },
   selectStoreHouseSid: function(sid) {
     return request({
-      url: '/crm/v1/storehouseproject/selectStoreBySid/'+ sid,
+      url: '/crm/v1/storehouseproject/selectStoreBySid/' + sid,
       method: 'post'
     })
   },
@@ -116,11 +154,11 @@ export default {
       method: 'get',
     });
   },
-    // 获取所有项目类型名称
-    getProjectType: function() {
-      return request({
-        url: '/crm/v1/projectinformation/getProjectType',
-        method: 'get',
-      });
-    },
+  // 获取所有项目类型名称
+  getProjectType: function() {
+    return request({
+      url: '/crm/v1/projectinformation/getProjectType',
+      method: 'get',
+    });
+  },
 }
diff --git a/supervise-crm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue b/supervise-crm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
index b7c1089a..69cc9858 100644
--- a/supervise-crm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
+++ b/supervise-crm-ui/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
@@ -1,222 +1,226 @@
 <template>
   <div>
-    <el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile" :accept="accept" list-type="picture-card" :limit="limit" :file-list="files" :on-remove="removeImage" :on-preview="handlePictureCardPreview" :on-progress="uploadProgrees" :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
-      <i class="el-icon-plus avatar-uploader-icon"/>
+    <el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile"
+      :accept="accept" list-type="picture-card" :limit="limit" :file-list="files" :on-remove="removeImage"
+      :on-preview="handlePictureCardPreview" :on-progress="uploadProgrees"
+      :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
+      <i class="el-icon-plus avatar-uploader-icon" />
     </el-upload>
-    <el-dialog :visible.sync="dialogVisible"  title="查看图片">
+    <el-dialog :visible.sync="dialogVisible" title="查看图片">
       <img width="100%" :src="dialogImageUrl" alt="">
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { uploadFile_yanchejiancha } from '@/api/portal/Upload'
-import { getStorage } from '@/utils/auth.js'
+  import {
+    uploadFile
+  } from '@/api/portal/Upload'
+  import {
+    getStorage
+  } from '@/utils/auth.js'
 
-export default {
-  model: {
-    prop: 'name',
-    event: 'change'
-  },
-  props: {
-    placeholder: {
-      type: String,
-      default: ''
-    },
-    bucket: {
-      type: String,
-      default: 'abc'
-    },
-    // 长度
-    width: {
-      type: String,
-      default: '270px'
-    },
-    limit: {
-      type: Number,
-      default: ''
-    },
-    accept: {
-      type: String,
-      default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
-    },
-    // 文件名称
-    name: {
-      type: Array,
-      required: true
-    },
-    uploadData: {
-      type: Object,
-      default: {}
-    }
-  },
-  data() {
-    return {
-      dialogImageUrl: '',
-      dialogVisible: false,
-      accessToken: null,
-      uploadFile: uploadFile_yanchejiancha,
-      fileList_FuJian: [],
-      enclosure: '',
-      file_add: '',
-      file_catch: '',
-      files: [],
-      files_list: [],
-      filedUrl: '',
-      // fileUrl: fileUrl,
-      // showpicture:false,
-      isview: false,
-      nameArr: '',
-      loadding: false
-    }
-  },
-  watch: {
-    name: {
-      deep: true,
-      immediate: true,
-      handler(newVal, oldVal) {
-        console.log('aaaa1', newVal)
-        this.files = newVal
-        console.log('aaaa2', this.files)
+  export default {
+    model: {
+      prop: 'name',
+      event: 'change'
+    },
+    props: {
+      placeholder: {
+        type: String,
+        default: ''
+      },
+      bucket: {
+        type: String,
+        default: 'abc'
+      },
+      // 长度
+      width: {
+        type: String,
+        default: '270px'
+      },
+      limit: {
+        type: Number,
+        default: ''
+      },
+      accept: {
+        type: String,
+        default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
+      },
+      // 文件名称
+      name: {
+        type: Array,
+        required: true
+      },
+      uploadData: {
+        type: Object,
+        default: {}
       }
-    }
-  },
-  mounted() {
-    this.$nextTick(() => {
-      this.Init()
-    })
-  },
-  created() {
-    this.uploadFile = uploadFile_yanchejiancha // 接口
-    this.accessToken = {
-      token: getStorage()
-    }
-  },
-  methods: {
-    showImg(imgList) {
-      this.files = imgList
-      console.log('123123123', this.files)
-    },
-    view() {
-      // window.open(this.filedUrl)
     },
-    // 页面第一次加载
-    Init() {
-      if (this.name !== undefined) {
-        this.files = []
-        for (var i = 0; i < this.name.length; i++) {
-          this.files.push({
-            name: this.name[i],
-            url: this.name[i]
-          })
-        }
+    data() {
+      return {
+        dialogImageUrl: '',
+        dialogVisible: false,
+        accessToken: null,
+        uploadFile: uploadFile,
+        fileList_FuJian: [],
+        enclosure: '',
+        file_add: '',
+        file_catch: '',
+        files: [],
+        files_list: [],
+        filedUrl: '',
+        // fileUrl: fileUrl,
+        // showpicture:false,
+        isview: false,
+        nameArr: '',
+        loadding: false
       }
     },
-    handlePictureCardPreview(file) {
-      this.dialogVisible = true
-      this.dialogImageUrl = file.url
-    },
-    // 上传方案--成功后执行
-    uploadImgSuccess_FuJian(response, file, fileList) {
-      console.log('您选择的file:', file)
-      if (file.response.code === '200') {
-        this.loadding = false
-        // 返显图片
-        this.filedUrl = this.fileUrl + file.response.data
-        // var uid = file.response.data
-        this.files.push({
-          name: file.response.data.sourceFileName,
-          url: file.response.data.fullUrl,
-          size: file.response.data.size
-        })
-        this.$emit('change', this.files)
-        this.$emit('eett', this.files)
+    watch: {
+      name: {
+        deep: true,
+        immediate: true,
+        handler(newVal, oldVal) {
+          this.files = newVal
+        }
       }
     },
-
-    removeImage(file, ImageFileList) {
-      this.files.splice(this.files.indexOf(file), 1)
-      const imgFiles = []
-      this.files.forEach((o) => {
-        imgFiles.push(o.url)
+    mounted() {
+      this.$nextTick(() => {
+        this.Init()
       })
-      this.$emit('fileChange', this.files)
     },
-    handleRemove(file, fileList) {
-      console.log('file:' + JSON.stringify(file))
-      console.log('fileList:' + JSON.stringify(fileList))
-      this.enclosure = ''
-      // 1. 保存新增文件id(this.file_add)
-      this.getNewFileId(fileList)
-      // 2. 保存数据库读取的已有文件id(this.file_catch)
-      this.getCatchFileId(file)
-      // 3. 保存并拼接id
-      this.getFileId()
-      // 4. 返回拼接id
-      this.$emit('change', this.enclosure)
-    },
-    // 返回this.file_add(新上传文件的id拼接集合)
-    getNewFileId(fileList) {
-      // debugger
-      this.file_add = ''
-      for (var i = 0; i < fileList.length; i++) {
-        if (fileList[i].response && fileList[i].response.code === '200') {
-          this.file_add = this.file_add + fileList[i].response.data + ','
-        }
+    created() {
+      this.uploadFile = uploadFile // 接口
+      this.accessToken = {
+        token: getStorage()
       }
-      if (this.file_add !== '') {
-        this.file_add = this.file_add.substring(0, this.file_add.length - 1)
-      }
-      // console.log('1. this.file_add: ' + this.file_add)
     },
-    // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
-    getCatchFileId(file) {
-      for (var i = 0; i < this.files_list.length; i++) {
-        if (this.file_catch !== '') {
-          // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
-          if (this.files_list[i].name === file.name) {
-            // 2. 拆开file_catch到fils_arry
-            var fils_arry = this.file_catch.split(',')
-            // 3. 从fils_arry去除 this.files_list[i].id
-            var arry = []
-            fils_arry.forEach((element) => {
-              // 不加载文件里面的
-              if (element !== this.files_list[i].id) {
-                arry.push(element)
-              }
+    methods: {
+      showImg(imgList) {
+        this.files = imgList
+      },
+      view() {
+        // window.open(this.filedUrl)
+      },
+      // 页面第一次加载
+      Init() {
+        if (this.name !== undefined) {
+          this.files = []
+          for (var i = 0; i < this.name.length; i++) {
+            this.files.push({
+              name: this.name[i],
+              url: this.name[i]
             })
-            // 4. 重新拼接成file_catch
-            this.file_catch = arry.join(',')
           }
         }
-      }
-      // console.log('2. this.file_catch:' + this.file_catch)
-    },
-    // 保存并拼接id
-    getFileId() {
-      // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
-      if (this.file_catch !== '') {
+      },
+      handlePictureCardPreview(file) {
+        this.dialogVisible = true
+        this.dialogImageUrl = file.url
+      },
+      // 上传方案--成功后执行
+      uploadImgSuccess_FuJian(response, file, fileList) {
+        console.log('您选择的file:', file)
+        if (file.response.code === '200') {
+          this.loadding = false
+          // 返显图片
+          this.filedUrl = this.fileUrl + file.response.data
+          // var uid = file.response.data
+          this.files.push({
+            name: file.response.data.sourceFileName,
+            url: file.response.data.fullUrl,
+            size: file.response.data.size
+          })
+          this.$emit('change', this.files)
+          this.$emit('eett', this.files)
+        }
+      },
+
+      removeImage(file, ImageFileList) {
+        this.files.splice(this.files.indexOf(file), 1)
+        const imgFiles = []
+        this.files.forEach((o) => {
+          imgFiles.push(o.url)
+        })
+        this.$emit('fileChange', this.files)
+      },
+      handleRemove(file, fileList) {
+        console.log('file:' + JSON.stringify(file))
+        console.log('fileList:' + JSON.stringify(fileList))
+        this.enclosure = ''
+        // 1. 保存新增文件id(this.file_add)
+        this.getNewFileId(fileList)
+        // 2. 保存数据库读取的已有文件id(this.file_catch)
+        this.getCatchFileId(file)
+        // 3. 保存并拼接id
+        this.getFileId()
+        // 4. 返回拼接id
+        this.$emit('change', this.enclosure)
+      },
+      // 返回this.file_add(新上传文件的id拼接集合)
+      getNewFileId(fileList) {
+        // debugger
+        this.file_add = ''
+        for (var i = 0; i < fileList.length; i++) {
+          if (fileList[i].response && fileList[i].response.code === '200') {
+            this.file_add = this.file_add + fileList[i].response.data + ','
+          }
+        }
         if (this.file_add !== '') {
-          this.enclosure = this.file_catch + ',' + this.file_add
+          this.file_add = this.file_add.substring(0, this.file_add.length - 1)
+        }
+        // console.log('1. this.file_add: ' + this.file_add)
+      },
+      // 返回this.file_catch（数库一寸照的文件的id的拼接集合）
+      getCatchFileId(file) {
+        for (var i = 0; i < this.files_list.length; i++) {
+          if (this.file_catch !== '') {
+            // 1. 检查当前删除的文件是否是修改文件列表里面的，如果是，将修改列表里去除此id
+            if (this.files_list[i].name === file.name) {
+              // 2. 拆开file_catch到fils_arry
+              var fils_arry = this.file_catch.split(',')
+              // 3. 从fils_arry去除 this.files_list[i].id
+              var arry = []
+              fils_arry.forEach((element) => {
+                // 不加载文件里面的
+                if (element !== this.files_list[i].id) {
+                  arry.push(element)
+                }
+              })
+              // 4. 重新拼接成file_catch
+              this.file_catch = arry.join(',')
+            }
+          }
+        }
+        // console.log('2. this.file_catch:' + this.file_catch)
+      },
+      // 保存并拼接id
+      getFileId() {
+        // console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
+        if (this.file_catch !== '') {
+          if (this.file_add !== '') {
+            this.enclosure = this.file_catch + ',' + this.file_add
+          } else {
+            this.enclosure = this.file_catch
+          }
         } else {
-          this.enclosure = this.file_catch
+          this.enclosure = this.file_add
         }
-      } else {
-        this.enclosure = this.file_add
-      }
-    },
-    // 上传失败
-    uploadError() {
-      this.loadding = false
-    },
-    uploadProgrees(event, file, fileList) {
-      if (Number(event.percent) > 0) {
-        this.loadding = true
+      },
+      // 上传失败
+      uploadError() {
+        this.loadding = false
+      },
+      uploadProgrees(event, file, fileList) {
+        if (Number(event.percent) > 0) {
+          this.loadding = true
+        }
+        //   console.log('event:', event)
       }
-      //   console.log('event:', event)
     }
   }
-}
 </script>
 
 <style scoped></style>
diff --git a/supervise-crm-ui/src/router/modules/codemenu.js b/supervise-crm-ui/src/router/modules/codemenu.js
index 67aea947..d370ee3a 100644
--- a/supervise-crm-ui/src/router/modules/codemenu.js
+++ b/supervise-crm-ui/src/router/modules/codemenu.js
@@ -66,7 +66,58 @@ const codemenu = [{
       noCache: true
     }
   }]
-},{
+},
+{
+  path: '/projectSet',
+  component: Layout,
+  redirect: '/projectSet/industry',
+  meta: {
+    title: '项目设置'
+  },
+  children: [{
+   path: '/projectSet/industry/industryInfo',
+   component: () => import('@/views/projectSet/industry/industryInfo.vue'),
+   name: 'industryInfo',
+   meta: {
+     title: '项目行业',
+     noCache: true
+    }
+  },{
+    path: '/projectSet/projectType/projectTypeInfo',
+    component: () => import('@/views/projectSet/projectType/projectTypeInfo.vue'),
+    name: 'projectTypeInfo',
+    meta: {
+      title: '项目类型',
+      noCache: true
+    }
+  },{
+    path: '/projectSet/projectState/projectStateInfo',
+    component: () => import('@/views/projectSet/projectState/projectStateInfo.vue'),
+    name: 'projectStateInfo',
+    meta: {
+      title: '项目状态',
+      noCache: true
+    }
+  },
+  {
+    path: '/projectSet/projectStaff/index',
+    component: () => import('@/views/projectSet/projectStaff/index.vue'),
+    name: 'projectStaff',
+    meta: {
+      title: '关联人员',
+      noCache: true
+    }
+  },{
+    path: '/projectSet/WechatPush/index',
+    component: () => import('@/views/projectSet/WechatPush/index.vue'),
+    name: 'WechatPush',
+    meta: {
+      title: '微信推送',
+      noCache: true
+    }
+  }]
+},
+{
   path: '/projectStaff',
   component: Layout,
   redirect: '/projectStaff/index',
diff --git a/supervise-crm-ui/src/views/project/index.vue b/supervise-crm-ui/src/views/project/index.vue
index 64fd4850..d7c160d5 100644
--- a/supervise-crm-ui/src/views/project/index.vue
+++ b/supervise-crm-ui/src/views/project/index.vue
@@ -58,12 +58,13 @@
               <el-table-column label="所属行业" prop="industryName" width="120" align="center" />
             <el-table-column label="项目类型" prop="typeName" width="120" align="center" />
             <el-table-column label="授信额度" prop="creditLimit" width="120" align="center" />
+              <el-table-column label="签约日期" prop="signingDate" width="120" align="center" />
+              <el-table-column label="到期日期" prop="endDate" width="120" align="center" />
+              <el-table-column label="用信总额" prop="useLimit" width="120" align="center" />
             <el-table-column label="贷款行" prop="bankName" width="180" align="center" />
             <el-table-column label="客户经理" prop="bmanagerName" width="120" align="center" />
-            <el-table-column label="签约日期" prop="signingDate" width="120" align="center" />
-            <el-table-column label="结束日期" prop="endDate" width="120" align="center" />
-            <el-table-column label="企业名称"  prop="enterpriseName"  width="250"  align="center" />
-            <el-table-column label="联系人" prop="econtacts" width="100" align="center" />
+            <!-- <el-table-column label="企业名称"  prop="enterpriseName"  width="250"  align="center" /> -->
+            <!-- <el-table-column label="联系人" prop="econtacts" width="100" align="center" /> -->
             <el-table-column label="监管负责人" prop="regulatoryLeader" width="120" align="center" />
           </el-table>
         </div>
@@ -83,8 +84,8 @@
   import Pagination from '@/components/pagination'
   import pageye from '@/components/pagination/pageye'
   import ButtonBar from '@/components/ButtonBar'
-  import projectAdd from './projectAdd.vue'
-  import projectInfo from './projectInfo.vue'
+  import projectAdd from './projectAdd2.vue'
+  import projectInfo from './projectInfo2.vue'
   export default {
     name: 'CustomerManagement',
     components: {
diff --git a/supervise-crm-ui/src/views/project/projectAdd.vue b/supervise-crm-ui/src/views/project/projectAdd.vue
index 8e4d1e14..b529226e 100644
--- a/supervise-crm-ui/src/views/project/projectAdd.vue
+++ b/supervise-crm-ui/src/views/project/projectAdd.vue
@@ -294,7 +294,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <el-input v-model="formobj.econtacts" placeholder="" :readonly="true" style="width:100%"
+                <el-input v-model="formobj.econtacts" placeholder="请输入项目联系人" :readonly="true" style="width:100%"
                   class="addinputw" clearable />
               </el-form-item>
             </el-col>
diff --git a/supervise-crm-ui/src/views/project/projectAdd2.vue b/supervise-crm-ui/src/views/project/projectAdd2.vue
new file mode 100644
index 00000000..91dea887
--- /dev/null
+++ b/supervise-crm-ui/src/views/project/projectAdd2.vue
@@ -0,0 +1,1422 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{title}}</div>
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+
+    <div style="padding-bottom: 150px;" class="listconadd">
+      <el-steps :active="stepIndex" simple style="margin-top: 20px;">
+        <el-step title="基础信息" @click.native="stepClick(1)"></el-step>
+        <el-step title="关联仓库" @click.native="stepClick(2)"></el-step>
+        <el-step title="关联企业" @click.native="stepClick(3)"></el-step>
+        <el-step title="关联账户" @click.native="stepClick(4)"></el-step>
+        <el-step title="关联章证" @click.native="stepClick(5)"></el-step>
+      </el-steps>
+
+      <div v-show="stepIndex==1" style="margin-top: 30px;">
+
+        <el-form ref="dataForm" :model="formobj.baseInfo" label-position="top" label-width="190px" class="formadd">
+          <el-row style="border-top: 1px solid #e0e3eb;">
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目名称</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.entryName" placeholder="请输入项目名称" style="width:100%"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">所属行业</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-select v-model="formobj.baseInfo.industryName" class="addinputw" placeholder="请选择所属行业"
+                  style="width:100%" @change="getHangYe">
+                  <el-option v-for="item in industryList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目类型</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-select v-model="formobj.baseInfo.typeName" class="addinputw" placeholder="请选择项目类型"
+                  style="width:100%" @change="getType">
+                  <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">质押率(%)</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.bankPledgeRate" placeholder="请输入标准质押率" style="width:100%"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">贷款行</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-select v-model="formobj.baseInfo.bankName" class="addinputw" placeholder="请选择贷款行" style="width:100%"
+                  @change="getBank">
+                  <el-option v-for="item in bankList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightbs">
+              <el-form-item class="trightb_item">
+                <span slot="label">客户经理</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8" class="trightb_items">
+              <el-form-item class="trightb_item">
+                <el-select v-model="formobj.baseInfo.bmanagerName" class="addinputw" placeholder="请选择客户经理"
+                  style="width:100%" @change="getBManager">
+                  <el-option v-for="item in bManagerList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">授信额度</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.creditLimit" placeholder="请输入授信额度" style="width:100%"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">授信日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-date-picker v-model="formobj.baseInfo.engaDate" type="date" style="width:100%"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">签约日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-date-picker v-model="formobj.baseInfo.signingDate" type="date" style="width:100%"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">放款日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-date-picker v-model="formobj.baseInfo.loanDate" type="date" style="width:100%"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目说明</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="20">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.remarks" placeholder="请输入项目说明"
+                  style="width:100%;margin-bottom: 5px;" type="textarea" :rows="7" class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">监管负责人</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.regulatoryLeader" placeholder="请输入监管负责人" style="width:100%"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">监管主管</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.regulatorySupervisor" placeholder="请输入监管主管" style="width:100%"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">结束日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-date-picker v-model="formobj.baseInfo.endDate" type="date" style="width:100%"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">填表日期</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-date-picker v-model="formobj.baseInfo.fillInDate" type="date" style="width:100%"
+                  value-format="yyyy-MM-dd" placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+
+          </el-row>
+
+          <el-row>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目状态</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-select v-model="formobj.baseInfo.stateName" class="addinputw" placeholder="请选择项目状态"
+                  style="width:100%" @change="getStateName">
+                  <el-option v-for="item in stateList" :key="item.dictKey" :label="item.dictValue"
+                    :value="item.dictKey" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4" class="trightb">
+              <el-form-item class="trightb_item">
+                <span slot="label">项目状态说明</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.baseInfo.stateRemarks" placeholder="" :readonly="true" style="width:100%"
+                  class="addinputw" clearable />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div v-show="stepIndex==2" style="margin-top: 10px;">
+
+        <div class="step2Item">
+
+          <el-select v-model="cangKu.name" class="addinputw" placeholder="请选择仓库" style="width:20%" @change="getCangku">
+            <el-option v-for="item in tableAllList" :label="item.dictValue" :value="item.dictKey" />
+          </el-select>
+
+          <span class="step2ItemBtn" @click="addCangku()">添加</span>
+
+        </div>
+
+        <el-table :data="formobj.warehouse" border style="width: 98%;margin-left: 15px;margin-top: 10px;">
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="操作" wid align="center" width="116">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="仓库名称" prop="name" width="350" align="center" />
+          <el-table-column label="仓库地址" prop="address" align="center" />
+          <el-table-column label="联系人" prop="linkerName" width="200" align="center" />
+          <el-table-column label="联系电话" prop="linkerPhone" width="200" align="center" />
+        </el-table>
+
+
+      </div>
+
+      <div v-show="stepIndex==3" style="margin-top: 10px;">
+
+
+        <div class="step2Item">
+
+          <el-select v-model="enterprise.name" class="addinputw" placeholder="请选择企业" style="width:20%"
+            @change="getEnterName">
+            <el-option v-for="item in enterpriseAllList" :label="item.dictValue" :value="item.dictKey" />
+          </el-select>
+
+          <span class="step2ItemBtn" @click="addEnterprise()">添加</span>
+
+        </div>
+
+        <el-table :data="formobj.enterpriseList" border style="width: 98%;margin-left: 15px;margin-top: 10px;">
+          <!-- <el-table-column type="selection" align="center" width="50"/> -->
+          <el-table-column label="操作" wid align="center" width="116">
+            <template slot-scope="scope">
+              <el-button type="primary" size="mini" @click="doDel2(scope.row)">删除</el-button>
+            </template>
+          </el-table-column>
+          <el-table-column label="关联类型" prop="type" align="center" />
+          <el-table-column label="企业名称" prop="enterpriseName" align="center" />
+          <el-table-column label="联系人" prop="contacts" align="center" />
+          <el-table-column label="联系电话" prop="telephone" align="center" />
+        </el-table>
+      </div>
+
+      <div v-show="stepIndex==4" style="margin-top: 30px; width: 100%;">
+
+
+        <div class="step4item">
+
+          <div class="step4item-lift">
+
+            <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+              <span class="item-title">请填写账户信息</span>
+              <span class="step2ItemBtn" style="margin-right: 30px;" @click="addBanK">添加</span>
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">账户类型：</span>
+              <el-select v-model="bankInfo.bankType" class="addinputw" placeholder="请选择类型" style="width:70%"
+                @change="getBankType">
+                <el-option v-for="item in bankType" :label="item.dictValue" :value="item.dictKey" />
+              </el-select>
+
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">所属企业：</span>
+              <el-select v-model="bankInfo.bankEnterprise" class="addinputw" placeholder="请选择企业" style="width:70%"
+                @change="getBankEnterprise">
+                <el-option v-for="item in enterpriseRelevanceList" :label="item.dictValue" :value="item.dictKey" />
+              </el-select>
+
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">银行账号：</span>
+              <el-input v-model="bankInfo.bankNum" placeholder="请输入账号" style="width:70%" class="addinputw" clearable />
+
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">开户银行：</span>
+              <el-input v-model="bankInfo.bankName" placeholder="请输入账号" style="width:70%" class="addinputw" clearable />
+
+            </div>
+
+          </div>
+
+          <div class="step4item-right">
+
+            <el-table :data="formobj.bankList" border>
+              <el-table-column label="操作" wid align="center" width="116">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" @click="doDel3(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="账户类型" prop="accountType" align="center" />
+              <el-table-column label="所属企业" prop="enterpriseName" align="center" />
+              <el-table-column label="银行账号" prop="accountNumber" align="center" />
+              <el-table-column label="开户银行" prop="bank" align="center" />
+
+            </el-table>
+          </div>
+
+
+        </div>
+
+
+      </div>
+
+      <div v-show="stepIndex==5" style="margin-top: 30px;">
+
+        <div class="step4item">
+
+          <div class="step4item-lift">
+
+            <div style="display: flex;flex-direction: row;justify-content: space-between;align-items: center;">
+              <span class="item-title">请填写章证信息</span>
+              <span class="step2ItemBtn" style="margin-right: 30px;" @click="addIdCard">添加</span>
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">章证类型：</span>
+              <el-select v-model="idCardInfo.idCardType" class="addinputw" placeholder="请选择类型" style="width:70%"
+                @change="getIdCardType">
+                <el-option v-for="item in idCardType" :label="item.dictValue" :value="item.dictKey" />
+              </el-select>
+
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">所属企业：</span>
+              <el-select v-model="idCardInfo.idCardEnterprise" class="addinputw" placeholder="请选择企业" style="width:70%"
+                @change="getIdCardEnterprise">
+                <el-option v-for="item in enterpriseRelevanceList" :label="item.dictValue" :value="item.dictKey" />
+              </el-select>
+
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">章证名称：</span>
+              <el-input v-model="idCardInfo.name" placeholder="请输入名称" style="width:70%" class="addinputw" clearable />
+
+            </div>
+
+            <div class="step4item-lift-item">
+              <span class="item-text">章证图片</span>
+              <!-- <span class="item-text2">上传</span> -->
+            </div>
+
+            <upload style="margin-top: 10px;" ref="uploadImg2" v-model="imgList" :limit="9" @change="backData"
+              bucket="map" :upload-data="{ type: '0001' }"></upload>
+
+
+          </div>
+
+          <div class="step4item-right">
+
+            <el-table :data="formobj.idCardList" border>
+              <el-table-column label="操作" wid align="center" width="116">
+                <template slot-scope="scope">
+                  <el-button type="primary" size="mini" @click="doDel4(scope.row)">删除</el-button>
+                </template>
+              </el-table-column>
+              <el-table-column label="所属企业" prop="enterpriseName" align="center" />
+              <el-table-column label="章证类型" prop="idCardType" align="center" />
+              <el-table-column label="章证名称" prop="idCardName" align="center" />
+              <el-table-column label="章证图片" align="center">
+                <template slot-scope="scope">
+                  <span v-for="(item,index) in scope.row.urls" :key="index">
+                    <el-popover placement="left" trigger="click" width="300">
+                      <img :src="item.url" width="100%" />
+                      <img slot="reference" :src="item.url" :alt="item.url"
+                        style="max-height: 70px;max-width: 70px; padding: 5px" />
+                    </el-popover>
+                  </span>
+                </template>
+              </el-table-column>
+
+            </el-table>
+          </div>
+
+
+        </div>
+
+
+
+      </div>
+
+      <div style="display: flex;flex-direction: row;justify-content: center;margin-top: 50px;">
+        <el-button type="primary" size="small" style="margin-right: 20px;" :disabled="stepIndex==1"
+          @click="backClick">上一步</el-button>
+        <el-button type="primary" size="small" style="margin-left: 20px;" :disabled="stepIndex==5"
+          @click="nextClick">下一步</el-button>
+      </div>
+    </div>
+
+
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/project/project'
+  import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
+  export default {
+    components: {
+      upload
+    },
+    data() {
+      return {
+        imgList: [
+
+
+        ],
+        title: "【新增】项目信息",
+        submitdisabled: false,
+        stepIndex: 1,
+        formobj: {
+          sid: "",
+          baseInfo: {
+            entryName: "", // 项目名称
+            industryName: "", // 行业名称
+            industrySid: "",
+            typeName: "", // 项目类型
+            typeSid: "",
+            bankPledgeRate: "", // 质押率
+            creditLimit: "", // 授信额度
+            bankName: "", // 贷款行
+            bankSid: "",
+            bmanagerName: '', // 客户经理
+            managerSid: "",
+            engaDate: "", // 授信日期
+            loanDate: "", // 放款日期
+            signingDate: "", // 签约日期
+            remarks: "", // 项目说明
+            regulatoryLeader: "", // 监管负责人
+            regulatorySupervisor: "", // 监管部主管
+            endDate: "", // 结束日期
+            fillInDate: "", // 填表日期
+            stateSid: "",
+            stateName: "",
+            stateRemarks: "",
+          },
+          warehouse: [],
+          enterpriseList: [],
+          bankList: [],
+          idCardList: [],
+
+        },
+        industryAllList: [],
+        industryList: [],
+        typeAllList: [],
+        typeList: [],
+        bankAllList: [],
+        bankList: [],
+        stateAllList: [],
+        stateList: [],
+        bManagerAllList: [],
+        bManagerList: [],
+        enterpriseAllList: [],
+        enterpriseRelevanceList: [],
+        enterprise: {
+
+        },
+        tableAllList: [],
+        cangKu: {},
+        bankInfo: {
+
+        },
+        bankType: [{
+            dictValue: "微信",
+            dictKey: "1"
+          },
+          {
+            dictValue: "支付宝",
+            dictKey: "2"
+          },
+          {
+            dictValue: "银联",
+            dictKey: "3"
+          }
+        ],
+        idCardInfo: {
+
+        },
+        idCardType: [{
+            dictValue: "公章",
+            dictKey: "1"
+          },
+          {
+            dictValue: "证件",
+            dictKey: "2"
+          },
+        ]
+
+      }
+    },
+    created() {
+      this.loanbankinformation() // 贷款行
+      this.enterpriseinformation() // 项目单位
+      this.industrydictionary() // 行业字典信息
+      this.projtypedictionary() // 类型字典信息
+      this.projtypedstated() // 状态字典信息
+      this.selectStoreHouses() // 仓库字典信息
+    },
+    methods: {
+      backClick() {
+
+        if (this.stepIndex > 1)
+          this.stepIndex--
+
+      },
+      nextClick() {
+        if (this.stepIndex < 5)
+          this.stepIndex++
+
+      },
+      stepClick(index) {
+        this.stepIndex = index
+      },
+      addImg() {
+        console.log(6);
+      },
+      loanbankinformation() {
+        req.getUserListByOrg().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>11111111", res.data)
+            this.bankAllList = res.data
+            this.bankList = []
+            for (var i = 0; i < this.bankAllList.length; i++) {
+
+              let bank = {
+                dictValue: this.bankAllList[i].name,
+                dictKey: this.bankAllList[i].sid,
+
+              }
+              this.bankList.push(bank)
+            }
+
+          }
+        })
+      },
+      enterpriseinformation() {
+        req.getEnterpriseinformation().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>2222222", res.data)
+            this.enterpriseAllList = []
+            for (var i = 0; i < res.data.length; i++) {
+
+              let enterprise = {
+                dictValue: res.data[i].enterpriseName,
+                dictKey: res.data[i].sid,
+                type: "担保企业",
+                contacts: res.data[i].contacts,
+                telephone: res.data[i].telephone,
+
+              }
+              this.enterpriseAllList.push(enterprise)
+            }
+
+          }
+        })
+      },
+      industrydictionary() {
+        req.getIndustrydictionary().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>3333333", res.data)
+            this.industryAllList = res.data
+            this.industryList = []
+            for (var i = 0; i < this.industryAllList.length; i++) {
+
+              let industry = {
+                dictValue: this.industryAllList[i].industryName,
+                dictKey: this.industryAllList[i].sid,
+
+              }
+              this.industryList.push(industry)
+            }
+
+          }
+        })
+      },
+      projtypedictionary() {
+        req.getProjtypedictionary().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>444444", res.data)
+            this.typeAllList = res.data
+            this.typeList = []
+            for (var i = 0; i < this.typeAllList.length; i++) {
+
+              let type = {
+                dictValue: this.typeAllList[i].typeName,
+                dictKey: this.typeAllList[i].sid,
+
+              }
+              this.typeList.push(type)
+            }
+
+          }
+        })
+      },
+      projtypedstated() {
+        req.getProjtypedstated().then((res) => {
+          if (res.success) {
+            console.log(">>>>>>>>>5555", res.data)
+            this.stateAllList = res.data
+            this.stateList = []
+            for (var i = 0; i < this.stateAllList.length; i++) {
+              let type = {
+                dictValue: this.stateAllList[i].name,
+                dictKey: this.stateAllList[i].sid,
+                dictExplain: this.stateAllList[i].remarks,
+
+              }
+              this.stateList.push(type)
+            }
+          }
+        })
+      },
+      getHangYe(value) {
+        console.log(">>>>>>>>>getHangYe", value)
+        const choose = this.industryList.filter((item) => item.dictKey === value)
+        this.formobj.baseInfo.industryName = choose[0].dictValue
+        this.formobj.baseInfo.industrySid = choose[0].dictKey
+      },
+      getType(value) {
+        console.log(">>>>>>>>>getType", value)
+        const choose = this.typeList.filter((item) => item.dictKey === value)
+        this.formobj.baseInfo.typeName = choose[0].dictValue
+        this.formobj.baseInfo.typeSid = choose[0].dictKey
+      },
+      getBank(value) {
+        console.log(">>>>>>>>>getBank", value)
+        const choose = this.bankList.filter((item) => item.dictKey === value)
+        this.formobj.baseInfo.bankName = choose[0].dictValue
+        this.formobj.baseInfo.bankSid = choose[0].dictKey
+
+        let items = this.bankAllList.filter(
+          // function(item) {
+          // 	return item.id == val.id;
+          item => {
+            console.log('item: ' + JSON.parse(JSON.stringify(item)).sid)
+            console.log('val: ' + value)
+            if (JSON.parse(JSON.stringify(item)).sid == value) {
+              return true
+            }
+          })
+        console.log(">>>>>>>>>getBank", items)
+
+        this.formobj.baseInfo.bmanagerName = ''
+        this.formobj.baseInfo.managerSid = ''
+
+        this.bManagerAllList = items[0].children
+        this.bManagerList = []
+        for (var i = 0; i < this.bManagerAllList.length; i++) {
+
+          let bManager = {
+            dictValue: this.bManagerAllList[i].name,
+            dictKey: this.bManagerAllList[i].sid,
+
+          }
+          this.bManagerList.push(bManager)
+        }
+
+      },
+      getBManager(value) {
+        console.log(">>>>>>>>>getBManager", value)
+        const choose = this.bManagerList.filter((item) => item.dictKey === value)
+        this.formobj.baseInfo.bmanagerName = choose[0].dictValue
+        this.formobj.baseInfo.managerSid = choose[0].dictKey
+
+      },
+      getEnterName(value) {
+
+        console.log(">>>>>>>>>EnterName", value)
+        const choose = this.enterpriseAllList.filter((item) => item.dictKey === value)
+
+        this.enterprise.enterpriseSid = choose[0].dictKey
+        this.enterprise.name = choose[0].dictValue
+        this.enterprise.type = choose[0].type
+        this.enterprise.contacts = choose[0].contacts
+        this.enterprise.telephone = choose[0].telephone
+
+      },
+
+      addEnterprise() {
+        var info = {
+          enterpriseSid: this.enterprise.enterpriseSid,
+          enterpriseName: this.enterprise.name,
+          type: this.enterprise.type,
+          contacts: this.enterprise.contacts,
+          telephone: this.enterprise.telephone,
+        }
+
+        const choose = this.formobj.enterpriseList.filter((item) => item.enterpriseSid === info.enterpriseSid)
+        console.log(">>>>>>>>>addCangku", choose)
+        if (choose.length == 0) {
+          this.formobj.enterpriseList.push(info)
+
+          let enterprise = {
+              dictValue: info.enterpriseName,
+            dictKey: info.enterpriseSid,
+
+        }
+        this.enterpriseRelevanceList.push(enterprise)
+      } else {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "请勿重复添加!"
+        })
+      }
+
+
+
+
+    },
+    doDel2(row) {
+      console.log(">>>>>>>>>doDel", row)
+
+      const index = this.formobj.enterpriseList.filter((item) => item.sid === row.sid)
+      this.formobj.enterpriseList.splice(index, 1)
+
+      const index2 = this.enterpriseRelevanceList.filter((item) => item.dictKey === row.sid)
+      this.enterpriseRelevanceList.splice(index2, 1)
+      console.log(">>>>>>>>>doDel", index2)
+      console.log(">>>>>>>>>doDel", this.enterpriseRelevanceList)
+    },
+
+    getEnterpriseName(value) {
+      console.log(">>>>>>>>>getBManager", value)
+      const choose = this.enterpriseList.filter((item) => item.dictKey === value)
+      this.formobj.baseInfo.enterpriseName = choose[0].dictValue
+      this.formobj.baseInfo.enterpriseSid = choose[0].dictKey
+      let items = this.enterpriseAllList.filter(
+        // function(item) {
+        // 	return item.id == val.id;
+        item => {
+          console.log('item: ' + JSON.parse(JSON.stringify(item)).sid)
+          console.log('val: ' + value)
+          if (JSON.parse(JSON.stringify(item)).sid == value) {
+            return true
+          }
+        })
+      console.log(">>>>>>>>>getBManager", items)
+      this.formobj.baseInfo.econtacts = items[0].contacts
+    },
+    getStateName(value) {
+      console.log(">>>>>>>>>getStatedName", value)
+      const choose = this.stateList.filter((item) => item.dictKey === value)
+      this.formobj.baseInfo.stateName = choose[0].dictValue
+      this.formobj.baseInfo.stateSid = choose[0].dictKey
+      this.formobj.baseInfo.stateRemarks = choose[0].dictExplain
+    },
+    saveOrUpdate() {
+      console.log(">>>>>>>>>saveOrUpdate", this.formobj)
+
+      var bankData = []
+      var warehouseData = []
+      var idCardData = []
+      var enterpriseData = []
+
+      for (var i = 0; i < this.formobj.bankList.length; i++) {
+        var item = this.formobj.bankList[i]
+        bankData.push({
+          accountType: item.accountType,
+          accountNumber: item.accountNumber,
+          bank: item.bank,
+          enterpriseSid: item.bankEnterpriseSid,
+        })
+      }
+
+      for (var i = 0; i < this.formobj.warehouse.length; i++) {
+        var item = this.formobj.warehouse[i]
+        warehouseData.push({
+          shSid: item.shSid,
+        })
+      }
+
+      for (var i = 0; i < this.formobj.enterpriseList.length; i++) {
+        var item = this.formobj.enterpriseList[i]
+        enterpriseData.push({
+          enterpriseSid: item.enterpriseSid,
+        })
+      }
+
+
+      for (var i = 0; i < this.formobj.idCardList.length; i++) {
+        var item = this.formobj.idCardList[i]
+
+        var imgs = []
+
+        for (var j = 0; j < item.urls.length; j++) {
+          var img = item.urls[j]
+          imgs.push(img.url)
+        }
+
+        idCardData.push({
+          enterpriseSid: item.enterpriseSid,
+          idCardType: item.idCardType,
+          idCardName: item.idCardName,
+          urls: imgs,
+        })
+      }
+
+      var data = {
+        sid: this.formobj.sid,
+        baseInfo: this.formobj.baseInfo,
+        enterpriseList: enterpriseData,
+        bankList: bankData,
+        warehouse: warehouseData,
+        idCardList: idCardData
+
+      }
+
+      console.log(">>>>>>>>>", data)
+
+      req.saveInfo(data)
+        .then(resp => {
+          if (resp.success) {
+            this.$message({
+              showClose: true,
+              type: 'success',
+              message: resp.msg
+            })
+            this.handleReturn("true")
+
+            this.$refs.multipleTable.clearSelection();
+          } else {
+            // 根据resp.code进行异常情况处理
+          }
+        })
+        .catch(() => {})
+
+    },
+    selectStoreHouses() {
+      req.selectStoreHouse().then((res) => {
+        if (res.success) {
+          console.log(">>>>>>>>>selectStoreHouses", res.data)
+          this.tableAllList = []
+          for (var i = 0; i < res.data.length; i++) {
+            let type = {
+              dictValue: res.data[i].name,
+              dictKey: res.data[i].sid,
+              address: res.data[i].address,
+              linkerName: res.data[i].linkerName,
+              linkerPhone: res.data[i].linkerPhone,
+
+            }
+            this.tableAllList.push(type)
+          }
+        }
+      })
+    },
+
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+
+      this.formobj = {
+        sid: "",
+        baseInfo: {
+          entryName: "", // 项目名称
+          industryName: "", // 行业名称
+          industrySid: "",
+          typeName: "", // 项目类型
+          typeSid: "",
+          bankPledgeRate: "", // 质押率
+          creditLimit: "", // 授信额度
+          bankName: "", // 贷款行
+          bankSid: "",
+          bmanagerName: '', // 客户经理
+          managerSid: "",
+          engaDate: "", // 授信日期
+          loanDate: "", // 放款日期
+          signingDate: "", // 签约日期
+          remarks: "", // 项目说明
+          regulatoryLeader: "", // 监管负责人
+          regulatorySupervisor: "", // 监管部主管
+          endDate: "", // 结束日期
+          fillInDate: "", // 填表日期
+          stateSid: "",
+          stateName: "",
+          stateRemarks: "",
+        },
+        warehouse: [],
+        enterpriseList: [],
+        bankList: [],
+        idCardList: [],
+
+      }
+      this.stepIndex = 1
+      this.cangKu.name = ''
+      this.enterprise.name = ''
+      this.bankInfo = {}
+      this.idCardInfo = {}
+      this.$emit('doback')
+    },
+    showAdd() {
+      this.title = "【新增】项目信息"
+    },
+    showEdit(row) {
+      this.title = "【修改】项目信息",
+        req.getInfoBySid(row.sid)
+        .then(resp => {
+          if (resp.success) {
+            console.log(">>>>>>>>>showEdit", resp.data)
+            this.formobj = resp.data
+
+            this.enterpriseRelevanceList = []
+            for (var i = 0; i < this.formobj.enterpriseList.length; i++) {
+
+              let enterprise = {
+                dictValue: this.formobj.enterpriseList[i].enterpriseName,
+                dictKey: this.formobj.enterpriseList[i].enterpriseSid,
+
+              }
+              this.enterpriseRelevanceList.push(enterprise)
+            }
+
+            //   this.formobj.entryName = resp.data.entryName
+            //   this.formobj.sid = resp.data.sid
+            //   this.formobj.industryName = resp.data.industryName
+            //   this.formobj.industrySid = resp.data.industrySid
+            //   this.formobj.bankPledgeRate = resp.data.bankPledgeRate
+            //   this.formobj.typeName = resp.data.typeName
+            //   this.formobj.typeSid = resp.data.typeSid
+            //   this.formobj.creditLimit = resp.data.creditLimit
+            //   this.formobj.bankName = resp.data.bankName
+            //   this.formobj.bankSid = resp.data.bankSid
+            //   this.formobj.bmanagerName = resp.data.bmanagerName
+            //   this.formobj.managerSid = resp.data.managerSid
+            //   this.formobj.engaDate = resp.data.engaDate
+            //   this.formobj.useLimit = resp.data.useLimit
+            //   this.formobj.loanDate = resp.data.loanDate
+            //   this.formobj.useDate = resp.data.useDate
+            //   this.formobj.signingDate = resp.data.signingDate
+            //   this.formobj.enterpriseName = resp.data.enterpriseName
+            //   this.formobj.enterpriseSid = resp.data.enterpriseSid
+            //   this.formobj.econtacts = resp.data.econtacts
+            //   this.formobj.remarks = resp.data.remarks
+            //   this.formobj.regulatoryLeader = resp.data.regulatoryLeader
+            //   this.formobj.generalManager = resp.data.generalManager
+            //   this.formobj.endDate = resp.data.endDate
+            //   this.formobj.fillInDate = resp.data.fillInDate
+            //   this.Sidlists = resp.data.enterpriseProjectVoList
+            //   this.enterSids.enterpriseSid = []
+            //   for (let i = 0; i < this.Sidlists.length; i++) {
+            //     this.enterSids.enterpriseSid.push(this.Sidlists[i].enterpriseSid)
+            //   }
+          }
+
+        })
+        .catch(e => {
+          this.formobj = row
+        })
+    },
+    getCangku(value) {
+      console.log(">>>>>>>>>getCangku", value)
+      const choose = this.tableAllList.filter((item) => item.dictKey === value)
+
+      this.cangKu.name = choose[0].dictValue
+      this.cangKu.sid = choose[0].dictKey
+      this.cangKu.address = choose[0].address
+      this.cangKu.linkerName = choose[0].linkerName
+      this.cangKu.linkerPhone = choose[0].linkerPhone
+
+    },
+    addCangku() {
+      var info = {
+        shSid: this.cangKu.sid,
+        name: this.cangKu.name,
+        address: this.cangKu.address,
+        linkerName: this.cangKu.linkerName,
+        linkerPhone: this.cangKu.linkerPhone,
+      }
+
+      const choose = this.formobj.warehouse.filter((item) => item.shSid === info.shSid)
+      console.log(">>>>>>>>>addCangku", choose)
+      if (choose.length == 0)
+        this.formobj.warehouse.push(info)
+      else
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "请勿重复添加!"
+        })
+    },
+    doDel(row) {
+      console.log(">>>>>>>>>doDel", row)
+
+      const index = this.formobj.warehouse.filter((item) => item.sid === row.sid)
+      this.formobj.warehouse.splice(index, 1)
+    },
+    addBanK() {
+      console.log(">>>>>>>>>doDel", this.bankInfo)
+
+      if (!this.bankInfo.bankType) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "账户类型不能为空!"
+        })
+        return
+      }
+
+      if (!this.bankInfo.bankEnterprise) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "所属企业不能为空!"
+        })
+        return
+      }
+
+
+      if (!this.bankInfo.bankNum) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "银行账号不能为空!"
+        })
+        return
+      }
+
+
+      if (!this.bankInfo.bankName) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "开户银行不能为空!"
+        })
+        return
+      }
+
+
+      var info = {
+        accountType: this.bankInfo.bankType,
+        bankTypeSid: this.bankInfo.bankTypeSid,
+        enterpriseName: this.bankInfo.bankEnterprise,
+        bankEnterpriseSid: this.bankInfo.bankEnterpriseSid,
+        accountNumber: this.bankInfo.bankNum,
+        bank: this.bankInfo.bankName,
+      }
+
+      const choose = this.formobj.bankList.filter((item) => item.accountNumber == info.accountNumber)
+      console.log(">>>>>>>>>addCangku", choose)
+      if (choose.length == 0)
+        this.formobj.bankList.push(info)
+      else
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "请勿重复添加!"
+        })
+
+
+    },
+    doDel3(row) {
+      console.log(">>>>>>>>>doDel", row)
+
+      const index = this.formobj.bankList.filter((item) => item.bankNum === row.bankNum)
+      this.formobj.bankList.splice(index, 1)
+    },
+    getBankType(value) {
+      console.log(">>>>>>>>>getBankType", value)
+      const choose = this.bankType.filter((item) => item.dictKey === value)
+      this.bankInfo.bankType = choose[0].dictValue
+      this.bankInfo.bankTypeSid = choose[0].dictKey
+    },
+    getBankEnterprise(value) {
+      console.log(">>>>>>>>>getCangku", value)
+      const choose = this.enterpriseRelevanceList.filter((item) => item.dictKey === value)
+
+      this.bankInfo.bankEnterprise = choose[0].dictValue
+      this.bankInfo.bankEnterpriseSid = choose[0].dictKey
+    },
+    addIdCard() {
+      console.log(">>>>>>>>>addIdCard", this.idCardInfo)
+
+      if (!this.idCardInfo.idCardType) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "章证类型不能为空!"
+        })
+        return
+      }
+
+      if (!this.idCardInfo.idCardEnterprise) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "所属企业不能为空!"
+        })
+        return
+      }
+
+
+      if (!this.idCardInfo.name) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "章证名称不能为空!"
+        })
+        return
+      }
+
+
+      if (this.imgList.length == 0) {
+        this.$message({
+          showClose: true,
+          type: 'error',
+          message: "章证图片不能为空!"
+        })
+        return
+      }
+
+
+      var info = {
+        idCardType: this.idCardInfo.idCardType,
+        idCardTypeSid: this.idCardInfo.idCardTypeSid,
+        enterpriseName: this.idCardInfo.idCardEnterprise,
+        enterpriseSid: this.idCardInfo.idCardEnterpriseSid,
+        idCardName: this.idCardInfo.name,
+        urls: this.imgList,
+      }
+      this.formobj.idCardList.push(info)
+
+      console.log("idCardList", this.formobj.idCardList)
+
+      this.imgList = []
+
+    },
+    doDel4(row) {
+      console.log(">>>>>>>>>doDel", row)
+
+      const index = this.formobj.idCardList.filter((item) => item.idCardName === row.idCardName)
+      this.formobj.idCardList.splice(index, 1)
+    },
+    getIdCardType(value) {
+      console.log(">>>>>>>>>getIdCardType", value)
+      const choose = this.idCardType.filter((item) => item.dictKey === value)
+      this.idCardInfo.idCardType = choose[0].dictValue
+      this.idCardInfo.idCardTypeSid = choose[0].dictKey
+    },
+    getIdCardEnterprise(value) {
+      console.log(">>>>>>>>>getIdCardEnterprise", value)
+      const choose = this.enterpriseRelevanceList.filter((item) => item.dictKey === value)
+
+      this.idCardInfo.idCardEnterprise = choose[0].dictValue
+      this.idCardInfo.idCardEnterpriseSid = choose[0].dictKey
+    },
+
+    backData(value) {
+      console.log(value, 999)
+      console.log("imgList", this.imgList)
+      // const aa = []
+      // if (value.length > 0 && value != null && value != undefined) {
+      //   for (var i = 0; i < value.length; i++) {
+      //     aa.push(value[i].url)
+      //   }
+      // }
+      // this.formobj.contractInfo.contractFiles = aa
+
+    },
+
+  }
+  }
+</script>
+<style scoped>
+  .trightb {
+    display: flex;
+    align-items: center;
+    text-align: ;
+    justify-content: center;
+  }
+
+  .trightb_item {
+    padding-top: 5px;
+  }
+
+  .trightbs {
+    display: flex;
+    align-items: center;
+    text-align: ;
+    justify-content: center;
+  }
+
+  .span {
+    margin-left: 50px;
+    font-size: 15px;
+    font-weight: 400;
+  }
+
+  /deep/ .el-collapse-item__header {
+    height: 40px;
+    padding: 10px;
+    font-weight: bold;
+    font-size: 20px;
+    text-align: left;
+    color: #ffffff;
+    background-color: #0294d7;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+
+  /* .el-row{
+    border-bottom: 1px solid #e0e3eb;
+  } */
+
+  /deep/ .formadd .el-row .trightbs {
+    border-top: 1px solid #e0e3eb;
+  }
+
+
+  /deep/ .formadd .el-row .trightb_items {
+    border-top: 1px solid #e0e3eb;
+  }
+
+  .step2Item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    margin-left: 20px;
+    padding-top: 15px;
+    padding-bottom: 15px;
+
+  }
+
+  .step2ItemBtn {
+    margin-left: 20px;
+    color: #fff;
+    background-color: #0294D7;
+    padding: 5px 15px;
+    border-radius: 5px;
+  }
+
+  .step4item {
+    margin-left: 15px;
+    margin-right: 15px;
+    display: flex;
+    flex-direction: row;
+  }
+
+  .step4item-lift {
+    width: 25%;
+    display: flex;
+    flex-direction: column;
+  }
+
+  .step4item-lift-item {
+    margin-top: 15px;
+  }
+
+  .item-title {
+    font-size: 18px;
+    color: #191919;
+  }
+
+  .item-text {
+    font-size: 15px;
+    color: #919191;
+  }
+
+  .item-text2 {
+    font-size: 15px;
+    color: #0294D7;
+    border-bottom: 1px #0294D7 solid;
+    padding: 2px;
+  }
+
+  .step4item-right {
+    flex: 1;
+  }
+
+  .Images {
+    width: 150px;
+    height: 100px;
+    margin: 10px 10px 30px 10px;
+    float: left;
+  }
+
+  .Images img {
+    width: 100px;
+    height: 100px;
+    margin-left: 24px;
+  }
+
+  .Images p {
+    color: #B8B8B8;
+    font-weight: 600;
+    font-size: 14px;
+    text-align: center;
+    margin-top: -30px;
+  }
+
+  .Images:hover p {
+    color: #b8b8b8b0;
+  }
+
+
+
+  .ImageX {
+    width: 150px;
+    height: 100px;
+    float: left;
+    margin: 10px 20px 40px 10px;
+  }
+
+  .ImageX img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .ImageX p {
+    color: #000;
+    text-align: center;
+    margin-top: -15px;
+  }
+
+  .ImageX p .Atext {
+    text-decoration: none;
+  }
+
+  .ImageX {
+    position: relative;
+  }
+
+  .ImageX i {
+    font-size: 30px;
+    color: #fff;
+    position: absolute;
+    top: 0;
+    left: 120px;
+  }
+
+  .xxx {
+    width: 150px;
+    height: 100px;
+  }
+
+  .xxx img {
+    width: 100%;
+    height: 100%;
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/project/projectInfo2.vue b/supervise-crm-ui/src/views/project/projectInfo2.vue
new file mode 100644
index 00000000..49c2b78e
--- /dev/null
+++ b/supervise-crm-ui/src/views/project/projectInfo2.vue
@@ -0,0 +1,383 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>【查看】项目信息</div>
+      <div>
+        <el-button type="info" size="small" icon="el-icon-close" @click="handleReturn()">关闭</el-button>
+      </div>
+    </div>
+    <div class="listconadd" style="padding-bottom: 50px;">
+      <div class="titwu">项目信息表</div>
+      <el-collapse v-model="activeNames" style="margin-left: 50px; margin-right: 50px;">
+        <el-collapse-item name="1" title="基础信息">
+          <el-form ref="dataForm" :model="temp.baseInfo" label-position="top" label-width="190px" class="formadd"
+            style="margin-top: -10px;margin-left: -40px;margin-right: -40px;">
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">项目名称</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.entryName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">所属行业</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.industryName}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">项目类型</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.typeName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">质押率(%)</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.bankPledgeRate}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">贷款行</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.bankName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">客户经理</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.bmanagerName}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">授信额度</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.creditLimit}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">授信日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.engaDate}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">签约日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.signingDate}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">放款日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.loanDate}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">项目说明</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="20">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.remarks}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">监管负责人</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.regulatoryLeader}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">监管主管</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.generalManager}}</span>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">结束日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.endDate}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">填表日期</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.fillInDate}}</span>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+
+            <el-row>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">项目状态</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.stateName}}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="4" class="trightb">
+                <el-form-item class="trightb_item">
+                  <span slot="label">项目状态说明</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8">
+                <el-form-item class="trightb_item">
+                  <span>{{temp.baseInfo.stateRemarks}}</span>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+
+          </el-form>
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-collapse v-model="activeNames" style="margin-left: 50px; margin-right: 50px;margin-top: 10px;">
+        <el-collapse-item name="2" title="关联仓库">
+
+          <el-table :data="temp.warehouse" border :row-style="{height:'50px'}">
+            <el-table-column label="仓库名称" prop="name" align="center" />
+            <el-table-column label="仓库地址" prop="address" align="center" />
+            <el-table-column label="联系人" prop="linkerName" align="center" />
+            <el-table-column label="联系电话" prop="linkerPhone" align="center" />
+          </el-table>
+
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-collapse v-model="activeNames" style="margin-left: 50px; margin-right: 50px;margin-top: 10px;">
+        <el-collapse-item name="3" title="关联企业">
+
+          <el-table :data="temp.enterpriseList" border :row-style="{height:'50px'}">
+           <el-table-column label="关联类型" prop="type" align="center" />
+           <el-table-column label="企业名称" prop="enterpriseName" align="center" />
+           <el-table-column label="联系人" prop="contacts" align="center" />
+           <el-table-column label="联系电话" prop="telephone" align="center" />
+          </el-table>
+
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-collapse v-model="activeNames" style="margin-left: 50px; margin-right: 50px;margin-top: 10px;">
+        <el-collapse-item name="4" title="关联账户">
+
+          <el-table :data="temp.bankList" border :row-style="{height:'50px'}">
+           <el-table-column label="账户类型" prop="accountType" align="center" />
+           <el-table-column label="所属企业" prop="enterpriseName" align="center" />
+           <el-table-column label="银行账号" prop="accountNumber" align="center" />
+           <el-table-column label="开户银行" prop="bank" align="center" />
+          </el-table>
+
+        </el-collapse-item>
+      </el-collapse>
+
+      <el-collapse v-model="activeNames" style="margin-left: 50px; margin-right: 50px;margin-top: 10px;">
+        <el-collapse-item name="5" title="关联章证">
+
+          <el-table :data="temp.idCardList" border :row-style="{height:'50px'}">
+           <el-table-column label="所属企业" prop="idCardEnterprise" align="center" />
+           <el-table-column label="章证类型" prop="idCardType" align="center" />
+           <el-table-column label="章证名称" prop="name" align="center" />
+           <el-table-column label="章证图片" align="center">
+             <template slot-scope="scope">
+               <span v-for="(item,index) in scope.row.imgList" :key="index">
+                 <el-popover placement="left" trigger="click" width="300">
+                   <img :src="item.url" width="100%" />
+                   <img slot="reference" :src="item.url" :alt="item.url"
+                     style="max-height: 70px;max-width: 70px; padding: 5px" />
+                 </el-popover>
+               </span>
+             </template>
+           </el-table-column>
+          </el-table>
+
+        </el-collapse-item>
+      </el-collapse>
+
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/project/project'
+
+  export default {
+    name: 'CustomerManagementInfo',
+    data() {
+      return {
+        activeNames: ['1', "2", "3", "4", "5"],
+        temp: {
+          baseInfo: {}
+        },
+      }
+    },
+    created() {
+
+    },
+    methods: {
+      showAdd(sid) {
+        req.getInfoBySid(sid)
+          .then(resp => {
+            if (resp.success) {
+              console.log(">>>>>>>>>2222222", resp.data)
+              this.temp = resp.data
+            }
+
+          })
+          .catch(e => {
+            this.$emit('doback')
+          })
+
+        // req.selectStoreHouseSid(sid).then((res) => {
+        //   if (res.success) {
+        //     this.temps = res.data
+        //   }
+        // })
+      },
+      // 组件返回
+      handleReturn() {
+        this.$emit('doback')
+      },
+    }
+  }
+</script>
+<style scoped>
+  .trightb {
+    display: flex;
+    align-items: center;
+    text-align: ;
+    justify-content: center;
+  }
+
+  .trightb_item {
+    padding-top: 5px;
+  }
+
+  .span {
+    margin-left: 50px;
+    font-size: 15px;
+    font-weight: 400;
+  }
+
+  /deep/ .el-collapse-item__header {
+    height: 40px;
+    padding: 10px;
+    font-weight: bold;
+    font-size: 20px;
+    text-align: left;
+    color: #ffffff;
+    background-color: #0294d7;
+  }
+
+  /deep/ .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+
+  .Images {
+    width: 150px;
+    height: 100px;
+    float: left;
+    margin: 10px 20px 40px 10px;
+  }
+
+  .Images img {
+    width: 100%;
+    height: 100%;
+  }
+
+  .Images:hover p {
+    color: #018ad2;
+    text-decoration: underline;
+  }
+
+  .Images p {
+    color: #000;
+    text-align: center;
+    margin-top: -15px;
+  }
+
+  .Images p .Atext {
+    text-decoration: none;
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/WechatPush/index.vue b/supervise-crm-ui/src/views/projectSet/WechatPush/index.vue
new file mode 100644
index 00000000..4c758d53
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/WechatPush/index.vue
@@ -0,0 +1,513 @@
+<template>
+  <div class="app-container">
+
+    <button-bar ref="btnbar" view-title="推送详情" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+    <div class="main-content">
+      <el-row class="mid">
+        <el-col :span="8" class="item">
+          <div class="listtop" style="width: 450px">
+            <div class="tit">项目列表</div>
+          </div>
+          <el-table :data="formobj" border ref="multipleTab" max-height="500px" style="width: 450px;font-size: 16px"
+            highlight-current-row @row-click="singleElection" :show-header="false" :row-style="{height:'50px'}">
+            <el-table-column prop="entryName" label="项目名称" />
+          </el-table>
+        </el-col>
+        <el-col :span="8" class="item" style="margin-left: 50px;">
+          <div class="listtop" style="width: 100%">
+            <div class="tit">关联人员</div>
+            <div
+              style="display: flex;flex-direction: row; align-items: center; justify-content: space-between;padding-left: 20px;padding-right: 20px;">
+              <img src="../../../../public/image/association.png" style="width: 35px;height: 25px; margin-right: 10px;" />
+              <span> 为已绑定微信公众号人员</span>
+            </div>
+
+          </div>
+
+          <div class="org-tree">
+            <el-tree :data="sysorganList" node-key="sid" :props="props" ref="tree" highlight-current check-strictly
+              :default-checked-keys="uploadData.users"
+              :default-expanded-keys="['2','fd6435f2-0005-11ec-a033-48452053aa33','3042d730-64e8-4e34-b08a-44adca4da3a5']"
+              @node-click="handleNodeClick">
+
+              <div class="custom-tree-node" slot-scope="{ node, data }"
+                style=" width: 100%;display: flex;flex-direction: row; align-items: center;flex-shrink: 1;">
+                <div :class="{ 'title': data.psid==='0' }">{{ node.label }}</div>
+
+                <div style="flex: 1;"></div>
+                <div style="margin-right: 35px;display: flex;flex-direction: row; align-items: center;">
+
+                  <!-- <span v-if="node.childNodes.length!=0"  :class="{ 'title': data.psid==='0' }">[ {{ node.childNodes.length}} ]</span> -->
+
+                  <span v-if="data.psid==='0'" :class="{ 'title': data.psid==='0' }" style="margin-right: 20px;">微信名称
+                  </span>
+
+                  <div v-if="node.childNodes.length==0"
+                    style="width: 100%;display: flex;flex-direction: row;align-items: center;">
+                    <div></div>
+                    <img v-if="data.isOpenId=='2'" src="../../../../public/image/association.png" style="width: 35px;height: 25px;" />
+                    <span style="margin-left: 30px;width:100px; overflow: hidden;text-align: center;
+          white-space: nowrap;
+          text-overflow: ellipsis;">正在完善 </span>
+
+                  </div>
+
+                </div>
+                <!-- <span
+                                     v-if="node.childNodes.length===0"
+                                     class="history"
+                                     @click="jumpHistory(node.data)"
+                                   >查看历史录像
+                                 </span> -->
+              </div>
+
+            </el-tree>
+          </div>
+          <!--  <el-table ref="multipleTable" :data="dataListOne" highlight-current-row border max-height="500px"
+            style="width: 400px;height: 500px;" @row-click="singleElection2" tooltip-effect="dark"
+            :row-style="{height:'50px'}">
+
+
+            <el-table-column label="ID" align="center">
+              <template slot-scope="scope">
+                <div
+                  style="display: flex;flex-direction: row; align-items: center; justify-content: space-between;padding-left: 20px;padding-right: 20px;">
+                  <span>{{scope.row.name}}</span>
+                  <img src="../../../public/image/association.png" style="width: 45px;height: 35px;"
+                    v-show="scope.row.isOpenId=='2'" />
+                </div>
+
+              </template>
+            </el-table-column>
+            <el-table-column prop="orgName" label="单位" align="center" />
+          </el-table> -->
+        </el-col>
+
+        <el-col :span="8" class="item" style="margin-left: 50px;width:700px;">
+          <div class="listtop">
+
+            <div class="tit">微信推送</div>
+
+            <div>
+              <span
+                style="color: #fff;background: #018AD2; font-size: 16px; margin-right: 20px; border-radius: 5px;padding: 4px 12px;"
+                @click="saveData()">保存</span>
+            </div>
+
+          </div>
+
+          <div v-for="(item, index) in sysorganList2">
+
+            <div class="itemlay">
+              <div
+                style="display: flex;flex-direction: row;align-items: center; background:#EDF1F7 ; height: 50px;padding: 10px;">
+                <el-checkbox style="zoom: 150%;" :value="item.state === '2'"
+                  @change="titlecheckbox(item.id,$event)"></el-checkbox>
+                <span style="margin-left: 10px;flex: 1; font-size: 18px;"> {{item.name}}</span>
+
+                <span
+                  style="color: #fff; margin-right: 20px;background: #018AD2; border-radius: 5px;padding: 4px 12px; font-size: 16px; "
+                  @click="showList(item.id)" v-show="!item.Show">展开</span>
+                <span
+                  style="color: #fff; margin-right: 20px;background: #018AD2; border-radius: 5px;padding: 4px 12px; font-size: 16px; "
+                  @click="showList2(item.id)" v-show="item.Show">收起</span>
+              </div>
+
+              <div style="padding: 10px 20px;">
+
+                <div v-for="(child,pos) in item.list" v-show="item.Show">
+
+                  <el-col
+                    style="padding-top: 5px;padding-bottom: 5px;display: flex;flex-direction: row;align-items: center;"
+                    :span="6">
+
+                    <el-checkbox style="zoom: 140%; " :value="child.state === '2'"
+                      @change="itemChecbox(child,index,$event)"></el-checkbox>
+                    <span
+                      style="margin-left: 10px; width: 100%;display: inline-block; overflow: hidden;white-space: nowrap;text-overflow: ellipsis; ">{{child.name}}</span>
+
+                  </el-col>
+
+                </div>
+
+              </div>
+
+
+            </div>
+
+
+          </div>
+
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/projectStaff/index'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye
+    },
+    data() {
+      return {
+        checkboxShow: true,
+        showText: "展开",
+        checked: false,
+        listLoading: false,
+        activeNames: ['1', "2"],
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        formobj: [],
+        dataListOne: [],
+        props: {
+          label: 'name',
+          children: 'children'
+        },
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        },
+        sids: [],
+        templateSelection: "",
+        //   当前选择的行的数据
+        checkList: [],
+        uploadData: {
+          userProjectSid: '',
+          templateSid: []
+        },
+        ValSids: [],
+        sysorganList: [],
+        sysorganList2: [],
+      }
+    },
+    watch: {
+      formobj: function() {
+        this.$nextTick(function() {
+          this.$refs['multipleTab'].setCurrentRow(this.formobj[0])
+        })
+      },
+    },
+
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        req.projectinformation().then(res => {
+          if (res.success) {
+            this.formobj = res.data
+
+            req.associationUserList(res.data[0].sid).then(res => {
+              this.sysorganList = res.data
+              // this.uploadData.userProjectSid = res.data[0].sid
+
+              // req.templateMessage(this.dataListOne[0].sid).then(res => {
+              //   if (res.success) {
+              //     this.sysorganList2 = res.data
+              //     //this.Array为数组名
+              //     this.sysorganList2.forEach(item => {
+
+              //       this.$set(item, 'Show', true)
+
+              //     })
+              //     console.log("aaaaaaaaaa", this.sysorganList2)
+              //   }
+              // })
+
+            })
+          }
+        })
+
+
+      },
+      singleElection(row) {
+        console.log("aaaaaaaaaa", row)
+        this.uploadData.userProjectSid = row.sid
+        req.associationUserList(row.sid).then(res => {
+          this.sysorganList = res.data
+
+          this.uploadData.userProjectSid = res.data[0].sid
+          req.templateMessage(this.dataListOne[0].sid).then(res => {
+            if (res.success) {
+              this.sysorganList = res.data
+
+              //this.Array为数组名
+              this.sysorganList.forEach(item => {
+
+                this.$set(item, 'Show', true)
+
+              })
+
+            }
+          })
+
+        })
+      },
+      singleElection2(row) {
+        console.log("aaaaaaaaaa", row)
+        this.uploadData.userProjectSid = row.sid
+        req.templateMessage(row.sid).then(res => {
+          if (res.success) {
+            this.sysorganList2 = res.data
+            //this.Array为数组名
+            this.sysorganList2.forEach(item => {
+
+              this.$set(item, 'Show', true)
+
+            })
+          }
+        })
+
+      },
+      showList(id) {
+        console.log("aaaaaaaaaa", id)
+        const item = this.sysorganList2.find((item => item.id == id))
+
+        item.Show = !item.Show
+
+        console.log("aaaaaaaaaa", item)
+      },
+      showList2(id) {
+        console.log("aaaaaaaaaa", id)
+        const item = this.sysorganList2.find((item => item.id == id))
+        item.Show = !item.Show
+        console.log("aaaaaaaaaa", item)
+      },
+      titlecheckbox(id, info) {
+        console.log("aaaaaaaaaa", id)
+        console.log("aaaaaaaaaa", info)
+
+
+
+
+        const item = this.sysorganList2.find((item => item.id == id))
+
+        item.state = info ? "2" : '1'
+
+        item.list.forEach(item => {
+
+          this.$set(item, 'state', info ? "2" : '1')
+
+        })
+
+
+        console.log("aaaaaaaaaa", item)
+
+
+      },
+      itemChecbox(child, index, info) {
+        console.log("aaaaaaaaaa", child)
+        console.log("aaaaaaaaaa", index)
+        console.log("aaaaaaaaaa", info)
+        child.state = info ? "2" : "1"
+
+        console.log("aaaaaaaaaa", this.sysorganList2[index].list)
+
+        var newList = this.sysorganList2[index].list
+
+        var count = 0
+        for (var i = 0; i < newList.length; i++) {
+          var item = newList[i]
+
+          if (item.state == '2') {
+            count++
+          }
+
+        }
+        console.log("aaaaaaaaaa", count)
+        console.log("aaaaaaaaaa", newList.length)
+        this.sysorganList2[index].state = count == newList.length ? "2" : "1"
+
+      },
+
+      saveData() {
+        var newList = []
+
+        for (var i = 0; i < this.sysorganList2.length; i++) {
+
+          var list = this.sysorganList2[i].list
+
+          for (var j = 0; j < list.length; j++) {
+
+            if (list[j].state == '2')
+              newList.push(
+                list[j].sid
+              )
+          }
+
+        }
+
+        console.log("newList", newList)
+
+
+        this.uploadData.templateSid = newList
+        console.log("uploadData", this.uploadData)
+        req.saveProjectTemplate(this.uploadData).then(res => {
+          if (res.success) {
+            this.$message({
+              message: '保存成功',
+              type: 'success'
+            });
+          }
+        })
+      },
+      handleNodeClick(val, num) {
+
+        console.log("aaaaaaaaaa", val)
+
+
+        console.log("aaaaaaaaaa", num)
+
+        var userProjectSid = val.userProjectSid
+
+        if (userProjectSid) {
+          this.uploadData.userProjectSid = userProjectSid
+          req.templateMessage(userProjectSid).then(res => {
+            if (res.success) {
+              this.sysorganList2 = res.data
+              //this.Array为数组名
+              this.sysorganList2.forEach(item => {
+
+                this.$set(item, 'Show', true)
+
+              })
+            }
+          })
+        }
+
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped lang="scss">
+  ::v-deep .el-tree .el-tree-node .is-leaf+.el-checkbox .el-checkbox__inner {
+    display: inline-block;
+  }
+
+  ::v-deep .el-tree .el-tree-node .el-checkbox .el-checkbox__inner {
+    display: none;
+  }
+
+  // 设置节点高度
+  ::v-deep .el-tree-node__content {
+    height: 35px;
+  }
+
+  ::v-deep .title {
+    font-size: 18px;
+    color: #000;
+    font-weight: 600;
+    font-family: sans-serif;
+  }
+
+  ::v-deep .el-checkbox__label {
+    width: 100%;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+
+  .main-content {
+    display: flex;
+    flex-direction: row;
+
+    .mid {
+      width: 100%;
+      margin-top: 30px;
+      display: flex;
+      flex-direction: row;
+
+      .item {
+        display: flex;
+        flex-direction: column;
+
+        .listtop {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          padding-top: 25px;
+          padding-bottom: 25px;
+
+        }
+
+        .org-tree {
+          width: 100%;
+          height: 450px;
+          box-sizing: border-box;
+          /*padding-right: 10px;*/
+          border: 1px solid #edf1f7;
+          overflow: scroll;
+          overflow-x: hidden;
+        }
+
+        .itemlay {
+          display: flex;
+          flex-direction: column;
+        }
+
+      }
+
+    }
+  }
+
+  ::v-deep .el-collapse-item__header {
+    height: 40px;
+    padding: 10px;
+    font-size: 18px;
+    text-align: left;
+    color: #000;
+    background-color: #EDF1F7;
+  }
+
+  ::v-deep .el-collapse-item__content {
+    padding-bottom: 0;
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/industry/industryAdd.vue b/supervise-crm-ui/src/views/projectSet/industry/industryAdd.vue
new file mode 100644
index 00000000..924468f5
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/industry/industryAdd.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>项目行业信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">项目行业名称：</span>
+          <el-input v-model="formobj.industryName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">项目行业说明：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/dataDict/datadict'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          industryName: '',
+          remarks: ''
+        }
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+        if (this.formobj.sid) {
+          req.updateindustry(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn('true')
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        } else {
+          req.saveindustry(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn('true')
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        }
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          industryName: '',
+          remarks: ''
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+        req.industryFetchBySid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      }
+    }
+  }
+</script>
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/industry/industryInfo.vue b/supervise-crm-ui/src/views/projectSet/industry/industryInfo.vue
new file mode 100644
index 00000000..2476fe74
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/industry/industryInfo.vue
@@ -0,0 +1,238 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="项目行业维护" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="项目行业名称">
+                <el-input v-model="queryParams.params.industryName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">项目行业列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table
+            v-loading="tableLoading"
+            :data="dataList"
+            border
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+          >
+            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column label="操作" align="center" width="180">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+                <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="industryName" label="项目行业名称" align="center" />
+            <el-table-column prop="remarks" label="项目行业说明" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination
+            v-show="dataList.length > 0"
+            :total="queryParams.total"
+            :page.sync="queryParams.current"
+            :limit.sync="queryParams.size"
+            class="pagination"
+            @pagination="loadList"
+          />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+    import req from '@/api/dataDict/datadict'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './industryAdd'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            industryName: ''
+          }
+        },
+        sids: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        req.industryListPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach((element) => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+           total: 0,
+          params: {
+            code: '',
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.industryDelBySids(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      resetState() {
+        this.viewState = 1
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/projectStaff/index.vue b/supervise-crm-ui/src/views/projectSet/projectStaff/index.vue
new file mode 100644
index 00000000..41116d63
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/projectStaff/index.vue
@@ -0,0 +1,434 @@
+<template>
+  <div class="app-container">
+
+    <button-bar ref="btnbar" view-title="设置关联人员" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+    <div class="main-content">
+      <el-row class="mid">
+        <el-col :span="8" class="left">
+          <div class="listtop" style="width: 400px">
+            <div class="tit">项目列表</div>
+          </div>
+          <el-table :data="formobj" border ref="multipleTab" max-height="560px" style="width: 400px;font-size: 16px"
+            highlight-current-row @row-click="singleElection" :row-style="{height:'50px'}" :show-header="false">
+            <el-table-column prop="entryName" label="项目名称" />
+          </el-table>
+        </el-col>
+        <el-col :span="16" class="rigth">
+          <div class="rihthGl">
+            <div class="rigthJg">
+              <div class="listtop" style="width: 100%">
+                <span>关联人员</span>
+                <button class="Waiting" @click="getWaiting">取消关联</button>
+              </div>
+              <!-- <el-table ref="multipleTable" :data="dataListOne" border max-height="440px" style="width: 450px"
+               @selection-change="handlChange" tooltip-effect="dark" :row-style="{height:'50px'}" >
+               <el-table-column type="selection" width="55" align="center"/>
+               <el-table-column prop="name" label="ID" align="center" />
+               <el-table-column prop="orgName" label="单位" align="center" />
+             </el-table> -->
+
+              <div class="org-tree">
+                <el-tree :data="sysorganList" show-checkbox node-key="sid" :props="props" ref="tree" highlight-current
+                  check-strictly :default-checked-keys="uploadData.users"
+                  :default-expanded-keys="['2','fd6435f2-0005-11ec-a033-48452053aa33','3042d730-64e8-4e34-b08a-44adca4da3a5']"
+                  @check="handleNodeClick1">
+
+                  <div class="custom-tree-node" slot-scope="{ node, data }"
+                    style=" width: 100%;display: flex;flex-direction: row; align-items: center;flex-shrink: 1;">
+                    <div :class="{ 'title': data.psid==='0' }">{{ node.label }}</div>
+
+                  </div>
+
+                </el-tree>
+              </div>
+            </div>
+
+            <div class="rigthYh">
+              <div class="listtop" style="width: 100%">
+                <span>未关联人员</span>
+                <button class="relevance" @click="getRelevance">关联</button>
+              </div>
+              <div class="org-tree">
+                <eltree :data="sysorganList2" show-checkbox node-key="sid" :props="props" ref="tree2" highlight-current
+                  check-strictly :default-checked-keys="uploadData.users"
+                  :default-expanded-keys="['2','fd6435f2-0005-11ec-a033-48452053aa33','3042d730-64e8-4e34-b08a-44adca4da3a5']"
+                  @check="handleNodeClick2">
+                  <div class="custom-tree-node" slot-scope="{ node, data }"
+                    style=" width: 100%;display: flex;flex-direction: row; align-items: center;flex-shrink: 1;"
+                    :class="{'checkbox':data.isOrg==='1'}">
+                    <div :class="{ 'title': data.psid==='0' }">{{ node.label }}</div>
+
+
+                  </div>
+
+                </eltree>
+              </div>
+            </div>
+          </div>
+          <!-- <div class="Btn">
+            <el-button type="primary" @click="getPurchaseList">保存</el-button>
+            <el-button type="primary" style="margin-left: 40px;" @click="getCancel">取消</el-button>
+          </div> -->
+        </el-col>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+  import eltree from '@/utils/tree/src/tree.vue'
+  import req from '@/api/projectStaff/index'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      eltree,
+      ButtonBar,
+      Pagination,
+      pageye
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        formobj: [],
+        dataListOne: [],
+        props: {
+          sid: 'sid',
+          psid: "psid",
+          label: 'name',
+          children: 'children'
+        },
+        btnList: [{
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        },
+        sids: [],
+        templateSelection: "",
+        //   当前选择的行的数据
+        checkList: [],
+        uploadData: {
+          projectSid: '',
+          users: [],
+        },
+        ValSid: [],
+        ValSids: [],
+        sysorganList: [],
+        sysorganList2: [],
+      }
+    },
+    watch: {
+      formobj: function() {
+        this.$nextTick(function() {
+          this.$refs['multipleTab'].setCurrentRow(this.formobj[0])
+        })
+      },
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        req.projectinformation().then(res => {
+          if (res.success) {
+            this.formobj = res.data
+            this.uploadData.projectSid = res.data[0].sid
+            console.log("aaaaaaaaaa", this.uploadData.projectSid)
+            req.associationUserList(this.uploadData.projectSid).then(res => {
+              if (res.success) {
+                this.sysorganList = res.data
+              }
+            })
+            req.sysorganization(this.uploadData.projectSid).then(res => {
+              if (res.success) {
+                this.sysorganList2 = res.data
+              }
+            })
+          }
+        })
+
+      },
+      singleElection(row) {
+        // this.clearList()
+        this.uploadData.projectSid = row.sid
+        req.associationUserList(this.uploadData.projectSid).then(res => {
+          if (res.success) {
+            this.sysorganList = res.data
+          }
+        })
+        req.sysorganization(this.uploadData.projectSid).then(res => {
+          if (res.success) {
+            this.sysorganList2 = res.data
+          }
+        })
+      },
+
+      handleNodeClick1(val, num) {
+        console.log("aaaaaaaaaa", val)
+        console.log("aaaaaaaaaa", num)
+
+        this.uploadData.users = num.checkedKeys
+
+      },
+      // 点击取消关联
+      getWaiting() {
+        console.log("aaaaaaaaaa", this.uploadData)
+
+        req.usercancellation(this.uploadData).then(res => {
+          if (res.success) {
+            this.$message({
+              message: '取消关联成功',
+              type: 'success'
+            });
+
+            req.associationUserList(this.uploadData.projectSid).then(res => {
+              if (res.success) {
+                this.sysorganList = res.data
+              }
+            })
+            req.sysorganization(this.uploadData.projectSid).then(res => {
+              if (res.success) {
+                this.sysorganList2 = res.data
+              }
+            })
+
+          }
+        })
+        this.$nextTick(() => {
+
+          this.$refs['tree'].setCheckedKeys([])
+          this.$refs['tree2'].setCheckedKeys([])
+
+        });
+
+      },
+      handleNodeClick2(val, num) {
+        console.log("aaaaaaaaaa", val)
+        console.log("aaaaaaaaaa", num)
+
+        console.log("aaaaaaaaaa", val)
+        console.log("aaaaaaaaaa", num)
+
+        this.uploadData.users = num.checkedKeys
+      },
+      // 点击关联
+      getRelevance() {
+        console.log("aaaaaaaaaa", this.uploadData)
+
+        req.userprojectSave(this.uploadData).then(res => {
+          if (res.success) {
+            this.$message({
+              message: '关联成功',
+              type: 'success'
+            });
+
+
+            req.associationUserList(this.uploadData.projectSid).then(res => {
+              if (res.success) {
+                this.sysorganList = res.data
+              }
+            })
+            req.sysorganization(this.uploadData.projectSid).then(res => {
+              if (res.success) {
+                console.log("aaaaaaaaaa", res.data)
+                this.sysorganList2 = []
+                this.sysorganList2 = res.data
+
+              }
+            })
+          }
+        })
+        this.$nextTick(() => {
+
+          this.$refs['tree'].setCheckedKeys([])
+          this.$refs['tree2'].setCheckedKeys([])
+
+        });
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      }
+    }
+  }
+</script>
+<style scoped lang="scss">
+  ::v-deep .el-tree .el-tree-node .is-leaf+.el-checkbox .el-checkbox__inner {
+    display: inline-block;
+  }
+
+  ::v-deep .el-tree .el-tree-node .el-checkbox .el-checkbox__inner {
+    display: none;
+  }
+
+  // 设置节点高度
+  ::v-deep .el-tree-node__content {
+    height: 35px;
+  }
+
+  ::v-deep .title {
+    font-size: 18px;
+    color: #000;
+    font-weight: 600;
+    font-family: sans-serif;
+  }
+
+  // 树形结构 三角图标 设在右侧
+  // ::v-deep .el-tree-node__expand-icon {
+  //   position: absolute;
+  //   right: 2%;
+  // }
+
+  .main-content {
+    .mid {
+      width: 100%;
+      height: 540px;
+      margin-top: 30px;
+
+      .left {
+        .listtop {
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+          padding-top: 25px;
+          padding-bottom: 25px;
+        }
+      }
+
+      .rigth {
+        margin-left: -50px;
+        height: 600px;
+        border: 1px solid #dfe6ec;
+        position: relative;
+
+        .rihthGl {
+          width: 100%;
+          height: 100%;
+          display: flex;
+          justify-content: space-around;
+
+          .rigthJg {
+            margin-top: 30px;
+            width: 450px;
+
+            .org-tree {
+              width: 100%;
+              height: 450px;
+              box-sizing: border-box;
+              /*padding-right: 10px;*/
+              border: 1px solid #edf1f7;
+              overflow: scroll;
+              overflow-x: hidden;
+
+              .checkbox .is-leaf + .el-checkbox .el-checkbox__inner {
+                display: none;
+              }
+
+            }
+
+            .listtop {
+              display: flex;
+              flex-direction: row;
+              align-items: center;
+              padding-top: 25px;
+              padding-bottom: 25px;
+
+              .Waiting {
+                padding: 5px 10px;
+                border: 2px solid #018ad2;
+                color: #018ad2;
+                font-size: 14px;
+                border-radius: 5px;
+                margin-right: 20px;
+              }
+
+              .Waiting:hover {
+                background-color: #fff;
+              }
+            }
+          }
+
+          .rigthYh {
+            margin-top: 30px;
+            width: 450px;
+
+            .org-tree {
+              width: 100%;
+              height: 450px;
+              box-sizing: border-box;
+              /*padding-right: 10px;*/
+              border: 1px solid #edf1f7;
+              overflow: scroll;
+              overflow-x: hidden;
+            }
+
+            .listtop {
+              display: flex;
+              flex-direction: row;
+              align-items: center;
+              padding-top: 25px;
+              padding-bottom: 25px;
+
+              .relevance {
+                padding: 5px 10px;
+                border: 2px solid #018ad2;
+                color: #018ad2;
+                font-size: 14px;
+                border-radius: 5px;
+                margin-right: 20px;
+              }
+
+              .relevance:hover {
+                background-color: #fff;
+              }
+            }
+          }
+        }
+
+        .Btn {
+          position: absolute;
+          left: 45%;
+          top: 92%;
+        }
+      }
+    }
+
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/projectState/projectStateAdd.vue b/supervise-crm-ui/src/views/projectSet/projectState/projectStateAdd.vue
new file mode 100644
index 00000000..f14d1d50
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/projectState/projectStateAdd.vue
@@ -0,0 +1,172 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>项目状态信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">项目状态名称：</span>
+          <el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">项目状态说明：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/dataDict/datadict'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          name: '',
+          remarks: ''
+        }
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+        if (this.formobj.sid) {
+          req.updateprojectstated(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn('true')
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        } else {
+          req.saveprojectstated(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn('true')
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        }
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          name: '',
+          remarks: ''
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+        req.projectstatedBySid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      }
+    }
+  }
+</script>
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/projectState/projectStateInfo.vue b/supervise-crm-ui/src/views/projectSet/projectState/projectStateInfo.vue
new file mode 100644
index 00000000..08707e5e
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/projectState/projectStateInfo.vue
@@ -0,0 +1,237 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="项目状态维护" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="项目状态名称">
+                <el-input v-model="queryParams.params.name" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">项目状态列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table
+            v-loading="tableLoading"
+            :data="dataList"
+            border
+            style="width: 100%"
+            @selection-change="handleSelectionChange"
+          >
+            <!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column label="操作" align="center" width="180">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+                <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="项目状态名称" align="center" />
+            <el-table-column prop="remarks" label="项目状态说明" align="center" />
+
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination
+            v-show="dataList.length > 0"
+            :total="queryParams.total"
+            :page.sync="queryParams.current"
+            :limit.sync="queryParams.size"
+            class="pagination"
+            @pagination="loadList"
+          />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+    import req from '@/api/dataDict/datadict'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './projectStateAdd'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            name: ''
+          }
+        },
+        sids: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        req.projectstatedListPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach((element) => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+           total: 0,
+          params: {
+            name: ''
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.projectstatedDelBySids(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      resetState() {
+        this.viewState = 1
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
diff --git a/supervise-crm-ui/src/views/projectSet/projectType/projectTypeAdd.vue b/supervise-crm-ui/src/views/projectSet/projectType/projectTypeAdd.vue
new file mode 100644
index 00000000..c2e7d81c
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/projectType/projectTypeAdd.vue
@@ -0,0 +1,173 @@
+<template>
+  <div>
+
+    <div class="tab-header webtop">
+      <!-- 标题 -->
+      <div>项目类型信息</div>
+      <!-- start 添加修改按钮 -->
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+      </div>
+      <!-- end 添加修改按钮 -->
+      <!-- end 详情按钮 -->
+    </div>
+
+    <div>
+
+      <el-card class="box-card">
+        <div class="item">
+          <span class="item_text">项目类型名称：</span>
+          <el-input v-model="formobj.typeName" placeholder="" class="item_input" clearable />
+        </div>
+        <div class="item">
+          <span class="item_text">项目类型说明：</span>
+          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
+        </div>
+
+      </el-card>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+  import req from '@/api/dataDict/datadict'
+  export default {
+    data() {
+      return {
+        submitdisabled: false,
+        formobj: {
+          sid: '',
+          typeName: '',
+          remarks: ''
+        }
+      }
+    },
+    methods: {
+      saveOrUpdate() {
+        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+        if (this.formobj.sid) {
+          req.updateClass(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn('true')
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        } else {
+          req.saveClass(this.formobj)
+            .then(resp => {
+              if (resp.success) {
+                this.$message({
+                  showClose: true,
+                  type: 'success',
+                  message: resp.msg
+                })
+                this.handleReturn('true')
+              } else {
+                // 根据resp.code进行异常情况处理
+              }
+            })
+            .catch(() => {})
+        }
+      },
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          sid: '',
+          typeName: '',
+          remarks: ''
+        }
+        this.$emit('doback')
+      },
+
+      showAdd() {
+
+      },
+      showEdit(row) {
+        req.classFetchBySid(row.sid)
+          .then(resp => {
+            if (resp.success) {
+              this.formobj = resp.data
+            }
+          })
+          .catch(e => {
+            this.formobj = row
+          })
+      }
+    }
+  }
+</script>
+<style lang="scss">
+  .box-card {
+    margin-left: 60px;
+    margin-right: 60px;
+    min-width: 70%;
+    margin-top: 20px;
+
+    .item {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      margin-top: 15px;
+      height: 40px;
+      line-height: 40px;
+
+      .item_text {
+        flex: 0.8;
+        font-size: 18px;
+        text-align: right;
+      }
+
+      .item_input {
+        flex: 4;
+        font-size: 16px;
+        margin-left: 10px;
+        margin-right: 80px;
+      }
+
+      .item_left_input {
+        width: 20%;
+      }
+
+      .item_left_text {
+        height: 30px;
+        margin-left: 20px;
+        line-height: 30px;
+        color: #018AD2;
+        padding: 0px 15px;
+        border: 1.5px solid #018AD2;
+        border-radius: 5px;
+
+      }
+
+      .item_right {
+        flex: 1;
+        justify-items: center;
+
+        .item_right_list_text {
+          font-size: 16px;
+        }
+
+        .item_right_list_delect {
+          color: #5E94FF;
+          margin-left: 20px;
+          font-size: 16px;
+          text-decoration: underline;
+        }
+      }
+
+    }
+
+  }
+</style>
+
diff --git a/supervise-crm-ui/src/views/projectSet/projectType/projectTypeInfo.vue b/supervise-crm-ui/src/views/projectSet/projectType/projectTypeInfo.vue
new file mode 100644
index 00000000..8a4bf5b8
--- /dev/null
+++ b/supervise-crm-ui/src/views/projectSet/projectType/projectTypeInfo.vue
@@ -0,0 +1,225 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <button-bar ref="btnbar" view-title="项目类型维护" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">
+            {{ searchxianshitit }}
+          </el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form :inline="true" class="tab-header">
+              <el-form-item label="项目类型名称">
+                <el-input v-model="queryParams.params.typeName" placeholder="" clearable />
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" size="small" icon="el-icon-search" @click="dosearch">查询</el-button>
+              <el-button type="primary" size="small" icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!-- Start 项目列表头部 -->
+        <div class="listtop">
+          <div class="tit">项目类型列表</div>
+        </div>
+        <!-- End 项目列表头部 -->
+        <!-- Start 项目列表 -->
+        <div class="">
+          <el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
+            @selection-change="handleSelectionChange">
+            <el-table-column fixed width="80" label="序号" type="index" :index="indexMethod" align="center" />
+            <el-table-column label="操作" align="center" width="180">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+                <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="typeName" label="项目类型名称" align="center" />
+            <el-table-column prop="remarks" label="项目类型说明" align="center" />
+          </el-table>
+        </div>
+        <!-- End 项目列表 -->
+        <div class="pages">
+          <div class="tit" />
+          <!--  翻页  -->
+          <pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+            :limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+        </div>
+      </div>
+    </div>
+    <!-- End 查询和其列表部分 -->
+    <!-- 新增修改部分组件 -->
+    <divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+  </div>
+</template>
+
+<script>
+  import req from '@/api/dataDict/datadict'
+  import ButtonBar from '@/components/ButtonBar'
+  import Pagination from '@/components/pagination'
+  import pageye from '@/components/pagination/pageye'
+  import divAdd from './projectTypeAdd'
+  export default {
+    name: 'SupplierBankInfoIndex',
+    components: {
+      ButtonBar,
+      Pagination,
+      pageye,
+      divAdd
+    },
+    data() {
+      return {
+        btndisabled: false,
+        viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+        isSearchShow: false,
+        searchxianshitit: '显示查询条件',
+        tableLoading: false,
+        dataList: [],
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'info',
+            size: 'small',
+            icon: 'cross',
+            btnKey: 'doClose',
+            btnLabel: '关闭'
+          }
+        ],
+        queryParams: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        },
+        sids: []
+      }
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    created() {
+      this.loadList()
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      loadList() {
+        this.tableLoading = true
+        req.classListPage(this.queryParams).then((resp) => {
+          this.tableLoading = false
+          if (resp.success) {
+            const data = resp.data
+            this.queryParams.total = data.total
+            this.dataList = data.records
+          } else {
+            // 根据resp.code进行异常情况处理
+            this.dataList = []
+            this.queryParams.total = 0
+          }
+        }).catch(() => {
+          this.tableLoading = false
+        })
+      },
+      handleSelectionChange(row) {
+        const aa = []
+        row.forEach((element) => {
+          aa.push(element.sid)
+        })
+        this.sids = aa
+      },
+      // 序号
+      indexMethod(index) {
+        var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+        var pageindex = index + 1 + pagestart
+        return pageindex
+      },
+      dosearch() {
+        this.queryParams.current = 1
+        this.loadList()
+      },
+      resetQuery() {
+        this.queryParams = {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            typeName: '',
+          }
+        }
+        this.loadList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divadd'].showAdd()
+      },
+
+      toRelevancy(row) {
+        this.viewState = 3
+        this.$refs['divadd'].showEdit(row)
+      },
+      toRelevancyInfo(row) {
+
+        const tip = '请确认是否删除所选记录?'
+        this.$confirm(tip, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          const loading = this.$loading({
+            lock: true,
+            text: 'Loading',
+            spinner: 'el-icon-loading',
+            background: 'rgba(0, 0, 0, 0.7)'
+          })
+          req.classDelBySids(row.sid).then((resp) => {
+            loading.close()
+            if (resp.success) {
+              this.$message({
+                type: 'success',
+                message: resp.msg,
+                showClose: true
+              })
+              this.loadList()
+            } else {
+              // 根据resp.code进行异常情况处理
+            }
+          }).catch(e => {
+            loading.close()
+          })
+        }).catch(() => {})
+      },
+      resetState() {
+        this.viewState = 1
+      }
+    }
+  }
+</script>
+<style scoped>
+</style>
\ No newline at end of file