暂存

src/Form/projectChange/add.vue

@@ -68,18 +68,18 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="项目预算(元):" prop="budgetary">
-                <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
+                <el-input type="number" v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item label="总投资额(百万):" prop="budgetary">
-                <el-input v-model="form.totalinvestment" placeholder="总投资额"></el-input>
+                <el-input type="number" v-model="form.totalinvestment" placeholder="总投资额"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="造价(百万):" prop="budgetary">
-                <el-input v-model="form.costofconstruction" placeholder="造价"></el-input>
+                <el-input type="number" v-model="form.costofconstruction" placeholder="造价"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/Form/projectChange/edit.vue

@@ -69,18 +69,18 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="项目预算(元):" prop="budgetary">
-                <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
+                <el-input type="number" v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item label="总投资额(百万):" prop="budgetary">
-                <el-input v-model="form.totalinvestment" placeholder="总投资额"></el-input>
+                <el-input type="number" v-model="form.totalinvestment" placeholder="总投资额"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="造价(百万):" prop="budgetary">
-                <el-input v-model="form.costofconstruction" placeholder="造价"></el-input>
+              <el-form-item  label="造价(百万):" prop="budgetary">
+                <el-input type="number" v-model="form.costofconstruction" placeholder="造价"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/HDrpManagement/publicCustomer/index.vue

@@ -405,7 +405,7 @@ export default {
       this.$store.dispatch('optiontypeselect','customerpoolname').then(res=>{
         console.log(res,'公海池')
         this.option.poolList = res.data
-        this.selectParam.sa_customerpoolid = res.data[0].sa_customerpoolid
+       /* this.selectParam.sa_customerpoolid = res.data[0].sa_customerpoolid*/
         this.$refs.basicLayout.param.content.where = this.selectParam
         this.$refs.basicLayout.listData()
       })

src/HDrpManagement/publicManage/components/scopeOfAuthority/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="normal-panel panel2">
     <div class="tab flex-align-center">
-      <p :class="activeName === '组织架构'?'tab-act':''" @click="tabChange('组织架构')">组织架构</p>
-      <p :class="activeName === '营销组织'?'tab-act':''" @click="tabChange('营销组织')">营销组织</p>
+      <p :class="activeName === '企业组织'?'tab-act':''" @click="tabChange('企业组织')">企业组织</p>
+      <p :class="activeName === '合作伙伴'?'tab-act':''" @click="tabChange('合作伙伴')">合作伙伴</p>
     </div>
     <div style="padding-top:16px">
-      <dep v-show="activeName === '组织架构'" :defaultData="defaultData" :scrollHeight="scrollHeight" :obiectName="obiectName" :obiectId="obiectId" @onParams="onParams"></dep>
-      <mar v-show="activeName === '营销组织'" :defaultData="defaultData" :scrollHeight="scrollHeight" :obiectName="obiectName" :obiectId="obiectId" @onAgentParams="onAgentParams"></mar>
+      <dep v-show="activeName === '企业组织'" :defaultData="defaultData" :scrollHeight="scrollHeight" :obiectName="obiectName" :obiectId="obiectId" @onParams="onParams"></dep>
+      <mar v-show="activeName === '合作伙伴'" :defaultData="defaultData" :scrollHeight="scrollHeight" :obiectName="obiectName" :obiectId="obiectId" @onAgentParams="onAgentParams"></mar>
     </div>
   </div>
 </template>
@@ -23,7 +23,7 @@ export default {
   },
   data () {
     return {
-      activeName:'组织架构',
+      activeName:'企业组织',
       param:{
         "isonlymanager_dept":false,
         "isonlymanager_agent":false,

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

@@ -56,9 +56,9 @@
         </div>
       </el-col>
     </el-row>
-    <div class="footer">
+<!--    <div class="footer">
       <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange">{{`已选${checkedMenbers.length}\\${allDataLength}`}}</el-checkbox>
-    </div>
+    </div>-->
   </div>
 </template>
 

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

@@ -56,9 +56,9 @@
         </div>
       </el-col>
     </el-row>
-    <div class="footer">
+<!--    <div class="footer">
       <el-checkbox v-model="checkAll" :indeterminate="isIndeterminate" @change="handleCheckAllChange">{{`已选${checkedMenbers.length}\\${allDataLength}`}}</el-checkbox>
-    </div>
+    </div>-->
   </div>
 </template>
 

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

@@ -220,14 +220,15 @@ export default {
         this.form.enddate_due = ''
       }
       this.form.sat_campaignid = this.$route.query.id
-      if(this.form.province.length > 0) {
-        this.form.city = this.form.province[1]
-        this.form.county = this.form.province[2]
-        this.form.province = this.form.province[0]
-      }
+
       this.$refs['form'].validate(async (valid) => {
         console.log(valid)
         if (!valid) return false
+        if(this.form.province.length > 0) {
+          this.form.city = this.form.province[1]
+          this.form.county = this.form.province[2]
+          this.form.province = this.form.province[0]
+        }
         const res = await this.$api.requested({
           "id": 20221205162402,
           "content": this.form
@@ -235,6 +236,9 @@ export default {
         this.tool.showMessage(res,()=>{
           this.drawer = false
           this.$refs.form.resetFields()
+          this.form.city = ''
+          this.form.county = ''
+          this.form.province = ''
           this.$emit('onSuccess')
         })
       });

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" type="text" @click="onShow" :disabled="!tool.checkAuth($route.name,'bankCardInfor') || !data.disabled">编 辑</el-button>
+    <el-button size="mini" type="text" @click="onShow" :disabled="!tool.checkAuth($route.name,'bankCardInfor') || !disabled">编 辑</el-button>
     <el-drawer
         title=" 新建银行卡信息"
         :visible.sync="dialogFormVisible"
@@ -46,7 +46,7 @@
 <script>
 export default {
   name: "edit",
-  props:["data","disable"],
+  props:["data","disabled"],
   data(){
     return {
       dialogFormVisible:false,

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

@@ -15,7 +15,7 @@
         <p >{{scope.column.data[scope.column.columnname]}}</p>
       </template>
       <template v-slot:opreation="scope">
-        <edit class="inline-16" :data="scope.data" @updateSuccess="listData" :disable="data.disabled"></edit>
+        <edit class="inline-16" :data="scope.data" :disabled="data.disabled"  @updateSuccess="listData" ></edit>
         <el-popconfirm
             title="确定删除该银行卡信息吗？"
             @confirm="onDel(scope.data)"

src/SManagement/orderclue_detail/components/changeCustomer.vue

@@ -43,7 +43,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="客户等级:" >
-                <el-select v-model="form.customergrade" placeholder="请选择客户等级" style="width: 100%">
+                <el-select v-model="form.grade" placeholder="请选择客户等级" style="width: 100%">
                   <el-option
                       v-for="item in options.customerGrade"
                       :key="item.rowindex"
@@ -283,6 +283,7 @@ export default {
       this.gradeList()
       this.industryList()
       this.typeList()
+      this.queryCustomerGrade()
     },
     /*自动查重判断*/
     duplicateCheck(){

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -68,18 +68,18 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="项目预算(万元):" prop="budgetary">
-                <el-input v-model="form.budgetary" placeholder="项目预算"></el-input>
+                <el-input type="number" v-model="form.budgetary" placeholder="项目预算"></el-input>
               </el-form-item>
             </el-col>
 
             <el-col :span="24">
               <el-form-item label="总投资额(百万):" prop="budgetary">
-                <el-input v-model="form.totalinvestment" placeholder="总投资额"></el-input>
+                <el-input type="number" v-model="form.totalinvestment" placeholder="总投资额"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
               <el-form-item label="造价(百万):" prop="budgetary">
-                <el-input v-model="form.costofconstruction" placeholder="造价"></el-input>
+                <el-input type="number" v-model="form.costofconstruction" placeholder="造价"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -243,7 +243,7 @@ export default {
           { required: true, message: '请选择领域', trigger: 'change'}
         ],
         sa_brandid:[
-          { required: true, message: '请选择品牌', trigger: 'change'}
+          { required: false, message: '请选择品牌', trigger: 'change'}
         ],
         /*sa_projstagetempid:[
           { required: true, message: '请选择当前项目模板', trigger: 'blur'}
@@ -276,6 +276,8 @@ export default {
       console.log(this.data)
       this.form = Object.assign({},this.form,this.data)
       this.value = [this.form.province,this.form.city,this.form.county]
+      this.form.totalinvestment = ''
+      this.form.costofconstruction = ''
       this.queryBrand()
       this.queryTradefield()
     },