9.2

supervise-crm-ui/.env.development

@@ -5,5 +5,5 @@ ENV = 'development'
 VUE_APP_BASE_API = '/api'
 
 ## 配置测试和本地开发时的 接口地址
-VUE_APP_URL = "http://192.168.1.193:8112"
+VUE_APP_URL = "http://192.168.1.110:8112"
 ##VUE_APP_URL = "http://8.130.39.13:8112"

supervise-crm-ui/src/api/project/project.js

@@ -109,5 +109,18 @@ export default {
       method: 'post'
     })
   },
-
+  // 获取所有贷款行名称
+  getBankName: function() {
+    return request({
+      url: '/crm/v1/projectinformation/getBankName',
+      method: 'get',
+    });
+  },
+    // 获取所有项目类型名称
+    getProjectType: function() {
+      return request({
+        url: '/crm/v1/projectinformation/getProjectType',
+        method: 'get',
+      });
+    },
 }

supervise-crm-ui/src/views/project/index.vue

@@ -11,6 +11,26 @@
                 <el-input v-model="listQuery.params.entryName" maxlength="20" placeholder="请输入项目名称" class="addinputw"
                   clearable />
               </el-form-item>
+              <el-form-item label="项目类型">
+                  <el-select v-model="listQuery.params.projectType" placeholder="请选择"  >
+                  <el-option
+                     v-for="(item,i) in ProjectTypeList"
+                     :key="i"
+                     :label="item.projectType"
+                     :value="item.projectType">
+                   </el-option>
+                 </el-select>
+              </el-form-item>
+              <el-form-item label="贷款行">
+                  <el-select v-model="listQuery.params.bankName" placeholder="请选择"  >
+                  <el-option
+                     v-for="(item,i) in storehouseList"
+                     :key="i"
+                     :label="item.bankName"
+                     :value="item.bankName">
+                   </el-option>
+                 </el-select>
+              </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
               <el-button type="primary" icon="el-icon-search" size="small" @click="handleReset">查询</el-button>
@@ -103,10 +123,14 @@
           size: 10,
           params: {
             entryName: '',
+            projectType: '',
+            bankName: '',
           },
           total: 0
         },
-        viewState: 1
+        viewState: 1,
+        storehouseList:[],
+        ProjectTypeList:[],
       }
     },
     mounted() {
@@ -142,6 +166,7 @@
       // 初始化
       init() {
         this.getList()
+        this.getBankName()
       },
       // 序号
       indexMethod(index) {
@@ -149,6 +174,14 @@
         var pageindex = index + 1 + pagestart
         return pageindex
       },
+      getBankName(){
+        req.getBankName().then((res)=>{
+          this.storehouseList=res.data
+        })
+        req.getProjectType().then((res)=>{
+          this.ProjectTypeList=res.data
+        })
+      },
       // 查询列表信息
       getList() {
         this.listLoading = true
@@ -175,7 +208,9 @@
           size: 10,
           total: 0,
           params: {
-            entryName: ""
+            entryName: '',
+            projectType: '',
+            bankName: '',
           }
         }
         this.getList()

supervise-crm-ui/src/views/project/projectAdd.vue

@@ -56,17 +56,7 @@
                 </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.creditLimit" placeholder="请输入授信额度" style="width:100%" class="addinputw"
-                  clearable />
-              </el-form-item>
-            </el-col>
           </el-row>
           <el-row>
             <el-col :span="4" class="trightb">
@@ -83,12 +73,12 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="4" class="trightb">
+            <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">
+            <el-col :span="8" class="trightb_items">
               <el-form-item class="trightb_item">
                 <el-select v-model="formobj.bmanagerName" class="addinputw" placeholder="请选择客户经理" style="width:100%"
                   @change="getBManager">
@@ -98,10 +88,50 @@
               </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.enterpriseName" class="addinputw" placeholder="请选择项目单位" style="width:100%"
+                  @change="getEnterpriseName">
+                  <el-option v-for="item in enterpriseList" :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.econtacts" placeholder="请输入项目联系人" :readonly="true" 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>
+                <span slot="label">授信额度</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <el-input v-model="formobj.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">
@@ -111,44 +141,57 @@
                 </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>
+                <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.signingDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
+                <el-input v-model="formobj.useLimit" 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.useDate" 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>
+                <span slot="label">签约日期</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <el-select v-model="formobj.enterpriseName" class="addinputw" placeholder="请选择项目单位" style="width:100%"
+                <el-date-picker v-model="formobj.signingDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
-                  @change="getEnterpriseName">
+                  placeholder="选择日期">
-                  <el-option v-for="item in enterpriseList" :key="item.dictKey" :label="item.dictValue"
+                </el-date-picker>
-                    :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>
+                <span slot="label">放款日期</span>
               </el-form-item>
             </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-date-picker v-model="formobj.loanDate" type="date" style="width:100%" value-format="yyyy-MM-dd"
-                  class="addinputw" clearable />
+                  placeholder="选择日期">
+                </el-date-picker>
               </el-form-item>
             </el-col>
           </el-row>
@@ -307,7 +350,10 @@
           bankSid: "",
           bmanagerName: '', // 客户经理
           managerSid: "",
-          engaDate: "", // 接洽日期
+          engaDate: "", // 授信日期
+          useLimit: "", // 用信总额
+          loanDate: "", // 放款日期
+          useDate: "", // 用信日期
           signingDate: "", // 签约日期
           enterpriseName: "", // 项目单位
           enterpriseSid: "",
@@ -583,7 +629,10 @@
           bankSid: "",
           bmanagerName: '', // 客户经理
           managerSid: "",
-          engaDate: "", // 接洽日期
+          engaDate: "", 
+          useLimit: "", 
+          loanDate: "",
+          useDate: "",
           signingDate: "", // 签约日期
           enterpriseName: "", // 项目单位
           enterpriseSid: "",
@@ -626,6 +675,9 @@
                 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
@@ -672,7 +724,6 @@
           this.ImgSid=[...new Set(this.ValSid )]
           this.formobj.storeHouseProjectDto.shSids=oldArr
         }
-        console.log(this.ImgSid)
         this.drawer=false
         this.$refs.multipleTable.clearSelection();
       },
@@ -691,6 +742,12 @@
   .trightb_item {
     padding-top: 5px;
   }
+  .trightbs {
+    display: flex;
+    align-items: center;
+    text-align: ;
+    justify-content: center;
+  }
 
   .span {
     margin-left: 50px;
@@ -711,6 +768,12 @@
   /deep/ .el-collapse-item__content {
     padding-bottom: 0;
   }
+  /deep/ .formadd .el-row .trightbs{
+    border-top: 1px solid #e0e3eb;
+  }
+  /deep/ .formadd .el-row .trightb_items{
+    border-top: 1px solid #e0e3eb;
+  }
   .Images{
     width: 150px;
     height: 100px;

supervise-crm-ui/src/views/project/projectInfo.vue

@@ -46,43 +46,66 @@
                  <span>{{temp.typeName}}</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>
+                <span slot="label">贷款行</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                <span>{{temp.creditLimit}}</span>
+                 <span>{{temp.bankName}}</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>
+                <span slot="label">客户经理</span>
               </el-form-item>
             </el-col>
             <el-col :span="8">
               <el-form-item class="trightb_item">
-                 <span>{{temp.bankName}}</span>
+                 <span>{{temp.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>
+                <span slot="label">项目单位</span>
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+               <el-form-item class="trightb_item">
+              <span>{{temp.enterpriseName}}</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.bmanagerName}}</span>
+               <span>{{temp.econtacts}}</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>
+                <span slot="label">授信额度</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item class="trightb_item">
+                <span>{{temp.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" >
@@ -90,9 +113,11 @@
                  <span>{{temp.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>
+                <span slot="label">用信总额</span>
               </el-form-item>
             </el-col>
             <el-col :span="8" >
@@ -100,30 +125,41 @@
                  <span>{{temp.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.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>
+                <span slot="label">签约日期</span>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" >
-               <el-form-item class="trightb_item">
+              <el-form-item class="trightb_item">
-              <span>{{temp.enterpriseName}}</span>
+                 <span>{{temp.signingDate}}</span>
-               </el-form-item>
+              </el-form-item>
             </el-col>
             <el-col :span="4" class="trightb">
-               <el-form-item class="trightb_item">
+              <el-form-item class="trightb_item">
-               <span slot="label">项目联系人</span>
+                <span slot="label">放款日期</span>
-                </el-form-item>
+              </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" >
               <el-form-item class="trightb_item">
-               <span>{{temp.econtacts}}</span>
+                 <span>{{temp.engaDate}}</span>
               </el-form-item>
             </el-col>
           </el-row>
+
           <el-row>
             <el-col :span="4" class="trightb">
               <el-form-item class="trightb_item">