代码更新

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

@@ -34,7 +34,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent type="5" ref="member" typemx="经销项目协议" :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent type="12" ref="member"  :param="agentListPrams"  :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -63,7 +63,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -132,7 +132,7 @@
                     trigger="manual"
                     v-model="accountVisible"
                     width="500">
-                  <selectAgent type="7" ref="member" typemx="直销项目协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
+                  <selectAgent type="11" ref="member"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -161,7 +161,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
-                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入折扣"></el-input>
+                <el-input type="text" size="small" v-model="form.discountrate" placeholder="请输入0-100%"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -246,7 +246,7 @@
                     trigger="manual"
                     v-model="agentVisible"
                     width="500">
-                  <selectAgent ref="member" type="5" typemx="居间协议" :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
+                  <selectAgent ref="member" type="12"  :param="agentListPrams" :radio="true" @onSelect="centerChange" @onCancel="agentVisible = false"></selectAgent>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename"></el-input>
                 </el-popover>
               </el-form-item>
@@ -359,8 +359,8 @@ export default {
       callback()
     }
     var NumberSize = (rule, value, callback) => {
-      if (+value > 100 || +value < 1 && value) {
-        return callback(new Error('折扣范围(1-100)'));
+      if (+value > 100 || +value < 0 && value) {
+        return callback(new Error('折扣范围(0-100)'));
       }
       callback()
     }
@@ -397,7 +397,7 @@ export default {
         "sys_printmodelid": '',//可选
         "typemx":"",//可选
         "modelname":"",
-        "calculatemodel":'1',
+        "calculatemodel":'',
         "productdiscount":'',
         "orderratio":'',
         "ascription_title":'',
@@ -523,7 +523,10 @@ 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)
+      this.form.discountrate = ''
       this.drawer = true
       this.contractType = type
       // if (type == '居间') {

src/HDrpManagement/projectChange/modules/modules/quotation/modules/add.vue

@@ -75,9 +75,9 @@
                         :total="project.total">
                     </el-pagination>
                   </div>-->
-                  <el-input slot="reference" disabled :readonly="true" v-model="form.projectname" autocomplete="off" placeholder="请选择项目"   ></el-input>
-<!--                </el-popover>-->
 
+<!--                </el-popover>-->
+                <el-input  disabled  v-model="form.projectname" autocomplete="off" placeholder="请选择项目"   ></el-input>
               </el-form-item>
             </el-col>
             <el-col  :span="24" >

src/HDrpManagement/publicManage/components/scopeOfAuthority/modules/dep_auth.vue

@@ -101,7 +101,8 @@ export default {
             "departmentids":[],
             "containssub":1,
             "where": {
-              "condition": ""
+              "condition": "",
+              "status": "ACTIVE"
             }
         }
       }

src/HDrpManagement/publicManage/components/scopeOfAuthority/modules/mar_auth.vue

@@ -100,7 +100,8 @@ export default {
             "sa_saleareaids":[],
             "containssub":1,
             "where": {
-              "condition": ""
+              "condition": "",
+              "status": "ACTIVE"
             }
         }
       }

src/HManagement/clueManage/clue_private/modules/add.vue

@@ -173,7 +173,6 @@ export default {
             "totalinvestment": '', //总投资额（百万）
             "begdate_due": "", //预计开工时间
             "enddate_due": "", //预计完工时间
-            "type":1
           }
       },
       rules: {

src/HManagement/clueManage/clue_private/modules/edit.vue

@@ -167,7 +167,6 @@ export default {
         "cluesource": "",
         "sat_campaignid":0,//活动id，当活动id大于0是默认业务员创建
         "isprivate":1,//0表示公海，1表示私域
-        "type":1
       },
       arealist:[],
       rules: {

src/HManagement/clueManage/clue_public/modules/add.vue

@@ -171,7 +171,6 @@ export default {
           "totalinvestment": '', //总投资额（百万）
           "begdate_due": "", //预计开工时间
           "enddate_due": "", //预计完工时间
-          "type":1
         }
       },
       rules: {

src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -176,7 +176,6 @@ export default {
         "totalinvestment": '', //总投资额（百万）
         "begdate_due": "", //预计开工时间
         "enddate_due": "", //预计完工时间
-        "type":1
       },
       rules:{
         phonenumber:[

src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" :disabled="disabled" size="mini" @click="editBtn">编 辑</el-button>
+    <el-button type="text" :disabled="disabled || data.allocationstatus === '已分配'" size="mini" @click="editBtn">编 辑</el-button>
     <el-drawer
       title="编辑线索"
       :visible.sync="drawer"
@@ -163,7 +163,6 @@ export default {
         "cluesource": "",
         "sat_campaignid":0,//活动id，当活动id大于0是默认业务员创建
         "isprivate":0,//0表示公海，1表示私域
-        "type":1
       },
       rules:{
         phonenumber:[

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

@@ -98,7 +98,6 @@ export default {
         "sat_campaignid":0,//活动id，当活动id大于0是默认业务员创建
         "isprivate":1,//0表示公海，1表示私域，
         "sa_customersid":0,//可不传
-        "type":1
       },
       rules:{
         enterprisename: [

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

@@ -98,7 +98,6 @@ export default {
         "sat_campaignid":0,//活动id，当活动id大于0是默认业务员创建
         "isprivate":1,//0表示公海，1表示私域，
         "sa_customersid":0,//可不传
-        "type":1
       },
       rules:{
         enterprisename: [

src/SManagement/orderclue/components/add.vue

@@ -173,7 +173,6 @@ export default {
           "totalinvestment": '', //总投资额（百万）
           "begdate_due": "", //预计开工时间
           "enddate_due": "", //预计完工时间
-          "type":1
         }
       },
       rules: {

src/SManagement/orderclue/components/edit.vue

@@ -170,7 +170,6 @@ export default {
         "totalinvestment": '', //总投资额（百万）
         "begdate_due": "", //预计开工时间
         "enddate_due": "", //预计完工时间
-        "type":1
       },
       rules: {
         phonenumber: [

src/SManagement/orderclue/components/selectActivity/selectActivity.vue

@@ -65,8 +65,9 @@ export default {
           'isAll':0,
           "pageNumber":1,
           "pageSize":20,
+          "type":1,
           "where": {
-            "unend":1,
+            /*"unend":1,*/
             'condition':''
           }
         }