合作伙伴档案银行卡信息调整

src/Form/marketing2/agent/add.vue

@@ -268,7 +268,8 @@ export default {
         "standardsauth":0,
         "bank": "", //银行名称
         "bankcardno": "", //银行卡号
-        "bankname": "" //开户人
+        "bankname": "", //开户人
+        "sys_enterprise_bankid":''
       },
       ENlist:[],
       agent_level:[],
@@ -291,6 +292,8 @@ export default {
     onShow () {
       this.dialogVisible = true
       this.cooperationstatus === '正式' ? this.fill = true : this.fill = false
+      this.$refs.ent.params.content.where.condition = ''
+      this.$refs.ent.params.content.pageNumber = 1
       this.query_sysoptions()
       this.query_arealist()
     },
@@ -420,6 +423,11 @@ export default {
       this.form.sys_enterpriseid = item.sys_enterpriseid
       item.province = `${item.province}-${item.city}-${item.county}`
       this.enterprise = item
+      this.form.sys_enterprise_bankid = item.bankinfo.sys_enterprise_bankid
+      this.form.bank = item.bankinfo.bank
+      this.form.bankcardno = item.bankinfo.bankcardno
+      this.form.bankname = item.bankinfo.name
+
     },
     selectAgent (data) {
       this.form.parentid = data.sa_agentsid
@@ -508,4 +516,7 @@ export default {
   line-height: 34px;
   /* font-weight: 500; */
 }
+/deep/ .el-input__validateIcon {
+  display: none;
+}
 </style>

src/HDrpManagement/contractManage/components/TimeSelect.vue

@@ -3,6 +3,7 @@
     <span style="font-size:14px;">{{title && title}}</span>
     <el-date-picker
       v-model="time"
+      style="width: 100%"
       type="daterange"
       unlink-panels
       range-separator="至"
@@ -34,10 +35,10 @@ export default {
       if(!e) {
         this.$emit('clearSelect')
         return
-      } 
+      }
       let result = e.map(item => {
         return this.changeTimeFormat(item.getTime())
-      })   
+      })
       this.$emit('timeChange',result)
     },
     changeTimeFormat(time) {

src/HDrpManagement/contractManage/components/addContract.vue

@@ -66,14 +66,15 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
-                <el-input style="display:none" v-model="form.begdate"></el-input>
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+                <el-input style="display:none;width: 100%" v-model="form.begdate" ></el-input>
+                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期">
@@ -166,14 +167,15 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
-                <input type="text" style="display:none" v-model="form.begdate">
-                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+                <input type="text" style="display:none" v-model="form.begdate" >
+                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                     v-model="form.signdate"
+                    style="width: 100%"
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期">
@@ -272,13 +274,14 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期">
@@ -311,7 +314,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户" prop="sys_enterpriseid">
+              <el-form-item label="客户:" prop="sys_enterpriseid">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -323,7 +326,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目:" prop="projectname">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -334,6 +337,11 @@
                 </el-popover>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="项目编号:" prop="">
+                <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="请选择项目"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="项目地址:" prop="address">
                 <el-input disabled type="text" size="small" v-model="address" placeholder="请选择项目地址"></el-input>
@@ -393,13 +401,14 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
@@ -432,7 +441,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业" prop="enterprisename">
+              <el-form-item label="企业:" prop="enterprisename">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -467,13 +476,14 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  style="width: 100%"
                   value-format="yyyy-MM-dd"
                   type="date"
                   placeholder="选择日期">
@@ -481,7 +491,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="单套价格(元)" prop="signamount">
+              <el-form-item label="单套价格(元):" prop="signamount">
                 <el-input type="text" disabled size="small" placeholder="系统自动计算" v-model="form.signamount"></el-input>
               </el-form-item>
             </el-col>
@@ -573,7 +583,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="计算方式" prop="calculatemodel">
+              <el-form-item label="计算方式:" prop="calculatemodel">
                 <el-radio-group v-model="form.calculatemodel">
                   <el-radio label="1">按订单金额比例计算</el-radio>
                   <el-radio label="2">按居间产品折扣计算</el-radio>
@@ -593,7 +603,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
 

src/HDrpManagement/contractManage/components/editContract.vue

@@ -62,13 +62,14 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <el-input style="display:none" v-model="form.begdate"></el-input>
-                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期">
@@ -162,13 +163,14 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+                <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                     v-model="form.signdate"
+                    style="width: 100%"
                     type="date"
                     value-format="yyyy-MM-dd"
                     placeholder="选择日期">
@@ -267,13 +269,14 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
+                  style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
                   placeholder="选择日期">
@@ -306,7 +309,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="客户" prop="enterprisename">
+              <el-form-item label="客户:" prop="enterprisename">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -318,7 +321,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目:" prop="sa_projectid">
+              <el-form-item label="项目名称:" prop="sa_projectid">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -329,6 +332,11 @@
                 </el-popover>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="项目编号:" prop="">
+                <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="请选择项目"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="项目地址:" prop="">
                 <el-input disabled type="text" size="small" v-model="address"></el-input>
@@ -398,7 +406,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -427,7 +435,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="企业" prop="enterprisename">
+              <el-form-item label="企业:" prop="enterprisename">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -480,7 +488,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -577,7 +585,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="计算方式">
+              <el-form-item label="计算方式:">
                 <el-radio-group v-model="form.calculatemodel">
                   <el-radio :label="1">按订单金额比例计算</el-radio>
                   <el-radio :label="2">按居间产品折扣计算</el-radio>
@@ -597,7 +605,7 @@
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
-              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange"></time-select>
+              <time-select ref="timeSelect" class="inline-16" @clearSelect="clearTime" @timeChange="timeChange" style="width: 100%"></time-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/projectChange/modules/modules/contract/components/add.vue

@@ -138,7 +138,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="项目:" prop="projectname">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                     placement="bottom"
                     trigger="manual"
@@ -149,6 +149,11 @@
                 </el-popover>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="项目编号:" prop="">
+                <el-input disabled type="text" size="small" v-model="form.projectnum" placeholder="请选择项目"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="项目地址:" prop="">
                 <el-input disabled type="text" size="small" v-model="address"></el-input>
@@ -530,16 +535,14 @@ export default {
       console.log(this.flag,"是否经销")
     },
     addBtn (type) {
-      console.log(this.form,"form参数")
-      console.log(this.data,'data参数')
       this.form = Object.assign({},this.form,this.data)
-      console.log(this.flagTag)
       if (this.flagTag != 2){
         this.$message.error('当前项目报备审核未通过，不可创建合同');
       }else {
         this.form.discountrate = ''
         this.drawer = true
         this.contractType = type
+        this.address = this.data.province + this.data.city + this.data.county + this.data.address
       }
 
       // if (type == '居间') {

src/HDrpManagement/publicCustomer/modules/detail/bankCard/add.vue

@@ -65,7 +65,7 @@ export default {
           { required: true, message: '银行名称不能为空', trigger: 'blur' },
         ],
         bankcardno: [
-          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+          { required: true, message: '卡号不能为空', trigger: 'blur' },
         ],
         name: [
           { required: true, message: '开户人不能为空', trigger: 'blur' },

src/HDrpManagement/publicCustomer/modules/detail/bankCard/edit.vue

@@ -65,7 +65,7 @@ export default {
           { required: true, message: '银行名称不能为空', trigger: 'blur' },
         ],
         bankcardno: [
-          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+          { required: true, message: '卡号不能为空', trigger: 'blur' },
         ],
         name: [
           { required: true, message: '开户人不能为空', trigger: 'blur' },

src/SDrpManagement/salerPrivatecustomer/detail/modules/bankCard/add.vue

@@ -65,7 +65,7 @@ export default {
           { required: true, message: '银行名称不能为空', trigger: 'blur' },
         ],
         bankcardno: [
-          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+          { required: true, message: '卡号不能为空', trigger: 'blur' },
         ],
         name: [
           { required: true, message: '开户人不能为空', trigger: 'blur' },

src/SDrpManagement/salerPrivatecustomer/detail/modules/bankCard/edit.vue

@@ -65,7 +65,7 @@ export default {
           { required: true, message: '银行名称不能为空', trigger: 'blur' },
         ],
         bankcardno: [
-          { required: true, message: '卡号不嫩为空', trigger: 'blur' },
+          { required: true, message: '卡号不能为空', trigger: 'blur' },
         ],
         name: [
           { required: true, message: '开户人不能为空', trigger: 'blur' },

src/template/enterprise/index.vue

@@ -6,7 +6,8 @@
       v-model="visible">
       <div>
         <div class="flex-align-center flex-between" style="margin-bottom:10px">
-          <el-input style="width:200px" suffix-icon="el-icon-search" size="small" v-model="params.content.where.condition" placeholder="输入经销商信息" @keyup.enter.native="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" clearable></el-input>
+          <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="params.content.where.condition?params.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="params.content.where.condition" @keyup.native.enter="queryEnterpriseArchives(params.content.pageNumber = 1)" @clear="queryEnterpriseArchives(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          </el-input>
           <addTemp @onSuccess="onSuccess"></addTemp>
         </div>
         <el-table
@@ -133,5 +134,8 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
+/deep/ .el-input__validateIcon {
+  display: none;
+}
 </style>