暂存

src/HDrpManagement/contractManage/index.vue

@@ -83,7 +83,20 @@
           <span v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '居间'">居间协议</span>
         </div>
         <div  v-else-if="scope.data.column.columnname == 'discountrate'">
-          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}
+<!--          <div v-if="scope.data.column.data"></div>-->
+<!--          {{scope.data.column.data[[scope.data.column.columnname]] <1 ?(scope.data.column.data[[scope.data.column.columnname]] * 100).toFixed(2):100}}-->
+          <div v-if="scope.data.column.data.type === '框架'">
+            {{scope.data.column.data.discountrate<1?Math.round((scope.data.column.data.discountrate * 100)*100)/100:100}}
+          </div>
+          <div v-else-if="scope.data.column.data.type === '居间'">
+            <span v-if="scope.data.column.data.calculatemodel === 1">
+              {{scope.data.column.data.orderratio<1?Math.round((scope.data.column.data.orderratio * 100)*100)/100:100}}
+            </span>
+            <span v-if="scope.data.column.data.calculatemodel === 2">
+              {{scope.data.column.data.productdiscount<1?Math.round((scope.data.column.data.productdiscount * 100)*100)/100:100}}
+            </span>
+          </div>
+          <div v-else>--</div>
         </div>
         <div v-else>
           {{scope.data.column.data[[scope.data.column.columnname]]}}

src/HDrpManagement/contractManage/modules/detail.vue

@@ -214,7 +214,8 @@ export default {
         }
       })
       this.mainData = res.data
-      this.$refs.details.param.content.type = this.$route.query.tabIndex
+      /*console.log(this.$refs.details)
+      this.$refs.details.param.content.type = this.$route.query.tabIndex*/
       console.log(this.mainData);
       
       this.mainData.type == '项目' 

src/HManagement/clueManage/clue_import/detailPage/modules/edit.vue

@@ -7,7 +7,8 @@
       size="800px"
       direction="rtl"
       append-to-body
-      :show-close="false">
+      :show-close="false"
+      @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rule" ref="form" label-width="90px" label-position="right" size="small">
           <el-col :span="20">
@@ -16,7 +17,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+            <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
           </el-col>
           <el-col :span="24">
             <el-form-item label="联系人" prop="name">
@@ -62,7 +63,7 @@
         </el-form>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -138,6 +139,10 @@ export default {
       this.form.address = val.address
       this.areaSelectResult = [val.regProvince,val.regCity,val.regArea]
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.drawer = false
+      this.$refs.businessMessage.businessShow = false
     }
   }
 }

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

@@ -13,7 +13,7 @@
           </el-col>
           <el-col :span="4">
             <el-form-item label-width="0" >
-              <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
+              <businessMessage ref="businessMessage" :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
             </el-form-item>
 <!--            <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>-->
           </el-col>
@@ -157,6 +157,7 @@ export default {
     onClose () {
       this.$refs['ruleForm'].resetFields()
       this.activityVisible = false
+      this.$refs.businessMessage.businessShow = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑线索" :show-close="false" append-to-body :visible.sync="dialogFormVisible" size="600px">
+    <el-drawer title="编辑线索" :show-close="false" append-to-body :visible.sync="dialogFormVisible" size="600px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rules" label-position="right" label-width="80px" size="small">
@@ -11,7 +11,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+              <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
             </el-col>
             <el-col :span="24">
               <el-form-item label="联系人" prop="name">
@@ -65,7 +65,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -144,6 +144,11 @@ export default {
       this.form.address = val.address
       this.areaSelectResult = [val.regProvince,val.regCity,val.regArea]
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.activityVisible = false
+      this.$refs.businessMessage.businessShow = false
     }
   },
   mounted () {

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

@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage ref="businessMessage" :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -64,7 +64,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="addOrdercule" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -144,6 +144,9 @@ export default {
     },
     onClose () {
       this.$refs['ruleForm'].resetFields()
+      this.drawer = false
+      this.$refs.businessMessage.businessShow = false
+      this.activityVisible = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

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

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="mini" type="primary" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px">
+    <el-drawer title="编辑线索" append-to-body :visible.sync="dialogFormVisible" :show-close="false" size="600px" @close="onClose">
       <div class="drawer__panel">
         <el-row :gutter="10">
           <el-form :model="form" :rules="rule" ref="form" label-position="right" label-width="80px" size="small">
@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -68,7 +68,7 @@
       </div>
       
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="dialogFormVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -134,6 +134,11 @@ export default {
       this.form.enterprisename = val.companyName
       this.form.address = val.address
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.dialogFormVisible = false
+      this.$refs.businessMessage.businessShow = false
+      this.activityVisible = false
     }
   },
   mounted () {

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

@@ -7,7 +7,8 @@
       :show-close="false"
       size="800px"
       direction="rtl"
-      append-to-body>
+      append-to-body
+      @close="onClose">
       <div class="drawer__panel">
         <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
           <el-col :span="20">
@@ -16,7 +17,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <businessMessage :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
+            <businessMessage ref="businessMessage" :keyWord="form.enterprisename" @businessData="businessData"></businessMessage>
           </el-col>
           <el-col :span="24">
             <el-form-item label="联系人" prop="name">
@@ -62,7 +63,7 @@
         </el-form>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false,$refs.form.resetFields()" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="add()" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -146,6 +147,10 @@ export default {
       this.form.enterprisename = val.companyName
       this.form.address = val.address
       this.form.province = [val.regProvince,val.regCity,val.regArea]
+    },
+    onClose(){
+      this.drawer = false
+      this.$refs.businessMessage.businessShow = false
     }
   }
 }

src/SManagement/orderclue/components/add.vue

@@ -13,7 +13,7 @@
             </el-col>
             <el-col :span="4">
               <el-form-item label-width="0" >
-                <businessMessage :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
+                <businessMessage ref="businessMessage" :keyWord="param.content.enterprisename" @businessData="businessData"></businessMessage>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -64,7 +64,7 @@
         </el-row>
       </div>
       <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" @click="onClose" class="normal-btn-width">取 消</el-button>
         <el-button size="small" type="primary" @click="addOrdercule" class="normal-btn-width">确 定</el-button>
       </div>
     </el-drawer>
@@ -171,6 +171,7 @@ export default {
       this.areaSelectResult = result
     },
     onClose () {
+      this.drawer = false
       this.$refs['ruleForm'].resetFields()
       this.activityVisible = false
       this.param.content = {
@@ -188,6 +189,7 @@ export default {
         "isprivate":1,
         "campaign_name":''
       }
+      this.$refs.businessMessage.businessShow = false
     },
     centerChange (data) {
       this.param.content.campaign_name = data[0].name

src/SManagement/user/user-info/components/PassEdit.vue

@@ -82,6 +82,7 @@ export default {
                 type:'success'
               })
               this.$refs.form.resetFields()
+              this.dialogVisible = false
             } else {
               this.$notify({
                 title:'提示',