Merge branch 'internationalization' into translateUrgent

# Conflicts:
#	src/HDrpManagement/contractManage/components/addContract.vue
#	src/HDrpManagement/contractManage/components/editContract.vue

src/Form/contractManage/add.vue

@@ -13,17 +13,6 @@
         <el-dropdown-item command="居间">{{ $t('居间协议') }}</el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <!-- <el-popover
-      placement="bottom"
-      trigger="hover">
-      <div class="box">
-        <p>经销商合作协议</p>
-        <p>经销商合作协议</p>
-        <p>经销商合作协议</p>
-        <p>经销商合作协议</p>
-      </div>
-      <el-button ref="btn" slot="reference" size="small" type="primary">{{$t('新 建')}}</el-button>
-    </el-popover> -->
     <el-drawer
       :visible.sync="drawer"
       :with-header="false"

src/HDrpManagement/contractManage/components/editContract.vue

@@ -910,13 +910,6 @@ export default {
       this.accountVisible = false
       this.modelVisible = false
       this.contractVisible = false
-     /* key ? this[key] = true : ''
-      if (key === 'projectVisible'){
-        this.$refs.project.params.content.sys_enterpriseid = this.form.sys_enterpriseid
-        this.$refs.project.queryEnterpriseArchives()
-        this.$refs.form.validateField("enterprisename")
-        this.$refs.form.validateField("sys_enterpriseid")
-      }*/
       if (key === 'projectVisible'){
         if (this.form.sys_enterpriseid !== ''){
 
@@ -1091,33 +1084,13 @@ export default {
           where: {condition: ""},
         }
       })
-      console.log(res,'res')
       this.payTypeData = res.data.map((item,index)=>{
-       /* if (item.point === '订单审核'){
-          return {
-            label:item.ruleno +  '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' + "立账额度" + (item.amountrate * 100) +'% ' + '\xa0  \xa0 \xa0 \xa0' + '后置天数' + item.days + '天',
-            value:item.ruleno +  '' + item.point + '' + "立账额度" + (item.amountrate * 100) +'% ' + '' + '后置天数' + item.days + '天',
-          }
-        }else {
-          return {
-            label:item.ruleno + '\xa0  \xa0 \xa0 \xa0' + item.point + '\xa0  \xa0 \xa0 \xa0' +  '后置天数' + item.days + '天',
-            value:item.ruleno + '' + item.point + '' +  '后置天数' + item.days + '天',
-          }
-        }*/
         return {
           label:item.ruleno + '-' + item.remarks ,
           value:item.ruleno + '-' + item.remarks
         }
 
       })
-      /* res.data.forEach((item,index)=>{
-         if (item.point === '订单审核'){
-           this.payTypeData[index] = item.ruleno + ' ' + item.point + ' ' + "立账额度" + (item.amountrate * 100) +'% ' + '后置天数' + item.days
-         }else {
-           this.payTypeData[index] = item.ruleno + ' ' + item.point + ' ' +  '后置天数' + item.days
-         }
-       })*/
-      console.log(this.payTypeData,'处理后数据')
     },
     discountrateChange(){
       let discountrate = parseFloat(this.form.discountrate)

src/HDrpManagement/contractManage/components/selectAgentNew.vue

@@ -22,7 +22,6 @@
     </div>
     <el-empty v-if="tableData.length === 0" :description="$t('暂无数据')" :image-size="40"></el-empty>
     <el-button size="mini" type="text" style="margin-top:16px;float:right" @click="onCancel">{{$t('取 消')}}</el-button>
-    <!--	<el-button size="mini" type="primary" style="margin-top:16px;float:right;margin-right:10px" @click="onSelect">{{$t('确 定')}}</el-button>-->
     <div style="margin-top:16px;text-align:left">
       <el-pagination
           background
@@ -59,14 +58,11 @@ export default {
   methods:{
     async listData () {
 
-      /* if(!this.type) this.param.content.where.type = ''*/
-
       if (!this.flag){
         this.param.content.where.type = this.type
       }
 
       this.param.content.where.typemx = this.typemx
-      this.param.content.where.condition = this.search
       this.param.content.where.sa_projectid = this.sa_projectid || ''
 
       const res = await this.$api.requested(this.param)