Merge branch 'mergeBranch' into internationalization

# Conflicts:
#	src/Form/contractManage/add.vue
#	src/HDrpManagement/contractManage/components/addContract.vue
#	src/HDrpManagement/contractManage/components/editContract.vue
#	src/HDrpManagement/contractManage/components/selectAgentNew.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/addContract.vue

@@ -1,6 +1,5 @@
 <template>
   <div>
-    <!-- <p class="normal-title normal-panel" style="line-height:32px;padding-left:16px;border-bottom:1px solid #eeeeee">新建合同</p> -->
     <div>
       <p class="normal-title normal-panel" style="border-bottom:1px solid #cccccc;padding:16px">新建{{$route.query.type == '框架' ? '经销商合作' :$route.query.type == '直销'?'直销客户合作': $route.query.type}}合同</p>
       <div class="container normal-panel" style="padding-bottom:0">
@@ -31,17 +30,11 @@
                     trigger="manual"
                     v-model="salesmanVisible"
                     width="500">
-<!--                  <selectAgent type="5" ref="member"   :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>-->
                   <selectSalesman type="1" ref="selectSalesman" :sys_enterpriseid="form.sys_enterpriseid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
                 </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.salername"></el-input>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="折扣(%):" prop="discountrate"  >
                 <el-input  size="small" v-model="form.discountrate" placeholder="请输入0-100%" @change="discountrateChange"></el-input>
@@ -49,7 +42,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -77,7 +70,7 @@
                   style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -110,27 +103,10 @@
                     v-model="agentVisible"
                     width="500">
                   <selectAgent type="18" 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" :placeholder="$t('请选择客户')"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择客户"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                <el-popover
-                    placement="bottom"
-                    trigger="manual"
-                    v-model="projectVisible"
-                    width="600">
-                  <seleteProject ref="project" type="2" :sys_enterpriseid='form.sys_enterpriseid' @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
-                  <el-input readonly type="text" slot="reference" size="small" v-model="form.projectname" @focus="showChange('projectVisible')" placeholder="请选择项目"></el-input>
-                </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="salername">
                 <el-popover
@@ -150,7 +126,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -178,20 +154,10 @@
                     style="width: 100%"
                     type="date"
                     value-format="yyyy-MM-dd"
-                    :placeholder="$t('选择日期')">
+                    placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="24">
-              <el-form-item label="签约金额(元):" prop="signamount">
-                <el-input type="text" size="small" placeholder="系统自动计算" disabled v-model="form.signamount"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="合同模板:" prop="type">
-                <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
                 <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
@@ -221,7 +187,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -256,7 +222,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -284,7 +250,7 @@
                   style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -321,12 +287,12 @@
                   v-model="accountVisible"
                   width="500">
                   <selectAgent type="18" 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" :placeholder="$t('请选择客户')"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename" placeholder="请选择客户"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectname">
+              <el-form-item label="项目名称:" prop="projectname">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -342,11 +308,6 @@
                 <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>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
                 <el-popover
@@ -366,7 +327,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -381,23 +342,6 @@
                 <el-input type="text" size="small" v-model="form.reminddays" placeholder="请输入发货日期提醒天数"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="24">
-              <el-form-item label="收货人:" prop="receiptName">
-                <el-popover
-                    placement="bottom"
-                    trigger="manual"
-                    v-model="receiptVisible"
-                    width="600">
-                  <seleteReceipt ref="receipt" type="1" @onSelect="receiptChange" @onCanel="receiptVisible = false"></seleteReceipt>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('receiptVisible')" v-model="form.receiptName"></el-input>
-                </el-popover>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="收货人电话:" prop="phonenumber">
-                <el-input disabled type="text" size="small" v-model="form.phonenumber"></el-input>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="合同有效期:" prop="begdate">
                 <input type="text" style="display:none" v-model="form.begdate">
@@ -411,7 +355,7 @@
                   style="width: 100%"
                   value-format="yyyy-MM-dd"
                   type="date"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -486,7 +430,7 @@
                   style="width: 100%"
                   value-format="yyyy-MM-dd"
                   type="date"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -527,7 +471,7 @@
 
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择居间商" >
                     <template slot="append">
-                      <el-button size="small" @click="agentVisible = false;form.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">{{$t('清空')}}</el-button>
+                      <el-button size="small" @click="agentVisible = false;form.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">清空</el-button>
                     </template>
                   </el-input>
                 </el-popover>
@@ -546,7 +490,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectnum">
+              <el-form-item label="项目名称:" prop="projectnum">
                 <el-input disabled type="text" size="small" v-model="form.projectname" placeholder="请选择项目"></el-input>
               </el-form-item>
             </el-col>
@@ -556,7 +500,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('客户名称')+':'" :rules="{ required: false, message: '请选择客户', trigger: 'change,blur' }">
+              <el-form-item label="客户名称:" :rules="{ required: false, message: '请选择客户', trigger: 'change,blur' }">
                 <el-input disabled type="text" size="small" v-model="form.customername" placeholder="客户名称"></el-input>
               </el-form-item>
             </el-col>
@@ -578,7 +522,7 @@
                     v-model="form.signdate"
                     value-format="yyyy-MM-dd"
                     type="date"
-                    :placeholder="$t('选择日期')">
+                    placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -622,8 +566,8 @@
       </div>
     </div>
     <div class="fixed__btn__panel">
-      <el-button size="small" @click="onCancel" class="normal-btn-width">{{$t('取 消')}}</el-button>
-      <el-button size="small" type="primary" @click="onSubmit" :loading="loading" class="normal-btn-width">{{$t('确 定')}}</el-button>
+      <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+      <el-button size="small" type="primary" @click="onSubmit" :loading="loading" class="normal-btn-width">确 定</el-button>
     </div>
   </div>
 </template>
@@ -653,9 +597,9 @@ export default {
     }
     var NumberSize = (rule, value, callback) => {
       if (isNaN(parseFloat(value)) && value !== ''){
-        return callback(new Error(this.$t('输入不合法，请输入数值') ))
+        return callback(new Error('输入不合法，请输入数值'))
       }else if (+value > 100 || +value < 0 ) {
-        return callback(new Error(this.$t('折扣范围(0-100%)')));
+        return callback(new Error('折扣范围(0-100%)'));
       }
       callback()
     }
@@ -900,8 +844,8 @@ export default {
           if (this.$route.query.type == '居间' && this.centerEnterpriseList) {
             let is = this.centerEnterpriseList.some(item => item.sys_enterpriseid == this.form.sys_enterpriseid)
             if (is) {
-              this.$confirm('该项目商机已存在居间服务商，不可创建',this.$t('提示'),{
-                cancelButtonText:this.$t('取消'),
+              this.$confirm('该项目商机已存在居间服务商，不可创建','提示',{
+                cancelButtonText:'取消',
                 showConfirmButton:false
               }).then(() => {
                 this.$store.commit('setLoading',false)
@@ -1095,7 +1039,6 @@ export default {
 
     },
     salesmanChange(data){
-      console.log(data,"业务员")
       this.form.salername = data[0].name
       this.form.saler_hrid = data[0].hrid
       this.salesmanVisible = false
@@ -1138,7 +1081,6 @@ export default {
       this.agentVisible = false
     },
     concratChange (data) {
-      console.log(data,"输出")
       this.centerEnterpriseList = data.parties
       this.form.ascription_title = data.title
       this.form.ascription_contractid = data.sa_contractid
@@ -1154,7 +1096,6 @@ export default {
     },
     modelChange (data) {
       this.form.modelname = data.modelname
-      console.log(this.form.modelname);
 
       this.form.sys_printmodelid = data.sys_printmodelid
       this.modelVisible = false

src/HDrpManagement/contractManage/components/editContract.vue

@@ -1,6 +1,6 @@
 <template>
   <div >
-    <el-button @click="editBtn" :type="disabled?'':'primary'" :disabled="disabled" size="mini">{{$t('编 辑')}}</el-button>
+    <el-button @click="editBtn" :type="disabled?'':'primary'" :disabled="disabled" size="mini">编 辑</el-button>
     <el-drawer size="40%" :with-header="false" append-to-body :visible.sync="drawer" v-if="form.sa_contractid">
       <p class="normal-title normal-panel" style="border-bottom:1px solid #cccccc;padding:16px">编辑{{$route.query.type == '框架' ? '经销商合作' : $route.query.type}}合同</p>
       <div class="container normal-panel">
@@ -31,7 +31,6 @@
                     trigger="manual"
                     v-model="salesmanVisible"
                     width="500">
-                  <!--                  <selectAgent type="5" ref="member"   :param="agentListPrams" :radio="true" @onSelect="agentChange" @onCancel="agentVisible = false"></selectAgent>-->
                   <selectSalesman type="1" ref="selectSalesman" :sys_enterpriseid="form.sys_enterpriseid" :radio="true" @onSelect="salesmanChange" @onCancel="salesmanVisible = false"></selectSalesman>
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('salesmanVisible')" v-model="form.salername" placeholder="请选择业务员"></el-input>
                 </el-popover>
@@ -44,7 +43,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -72,7 +71,7 @@
                   style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -105,27 +104,10 @@
                     v-model="agentVisible"
                     width="500">
                   <selectAgent type="18" 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" :placeholder="$t('请选择客户')"></el-input>
+                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('agentVisible')" v-model="form.enterprisename" placeholder="请选择客户"></el-input>
                 </el-popover>
               </el-form-item>
             </el-col>
-            <!--            <el-col :span="24">
-                          <el-form-item :label="$t('项目名称')+':'" prop="projectname">
-                            <el-popover
-                                placement="bottom"
-                                trigger="manual"
-                                v-model="projectVisible"
-                                width="600">
-                              <seleteProject ref="project" type="2" :sys_enterpriseid='form.sys_enterpriseid' @onSelect="projectChange" @onCanel="projectVisible=false"></seleteProject>
-                              <el-input readonly type="text" slot="reference" size="small" v-model="form.projectname" @focus="showChange('projectVisible')" placeholder="请选择项目"></el-input>
-                            </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="salername">
                 <el-popover
@@ -145,7 +127,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -173,20 +155,10 @@
                     style="width: 100%"
                     type="date"
                     value-format="yyyy-MM-dd"
-                    :placeholder="$t('选择日期')">
+                    placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <!--            <el-col :span="24">
-                          <el-form-item label="签约金额(元):" prop="signamount">
-                            <el-input type="text" size="small" placeholder="系统自动计算" disabled v-model="form.signamount"></el-input>
-                          </el-form-item>
-                        </el-col>
-                        <el-col :span="24">
-                          <el-form-item label="合同模板:" prop="type">
-                            <el-input disabled type="text" size="small" :value="$route.query.type == '框架' ? '经销合作' : $route.query.type"></el-input>
-                          </el-form-item>
-                        </el-col>-->
             <el-col :span="24">
               <el-form-item label="合同描述:" prop="hrid">
                 <el-input type="textarea" size="small" v-model="form.remarks" placeholder="请输入描述信息" clearable></el-input>
@@ -216,7 +188,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="sa_projectid">
+              <el-form-item label="项目名称:" prop="sa_projectid">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -251,7 +223,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -279,7 +251,7 @@
                   style="width: 100%"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -321,7 +293,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="sa_projectid">
+              <el-form-item label="项目名称:" prop="sa_projectid">
                 <el-popover
                   placement="bottom"
                   trigger="manual"
@@ -337,11 +309,6 @@
                 <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>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="业务员:" prop="salername">
                 <el-popover
@@ -361,7 +328,7 @@
             </el-col>
             <el-col :span="24">
               <el-form-item label="付款条件:" prop="paytype">
-                <el-select v-model="form.paytype" :placeholder="$t('请选择')">
+                <el-select v-model="form.paytype" placeholder="请选择">
                   <el-option
                       v-for="item in payTypeData"
                       :key="item.value"
@@ -376,30 +343,13 @@
                 <el-input type="text" size="small" v-model="form.reminddays" placeholder="请输入发货日期提醒天数"></el-input>
               </el-form-item>
             </el-col>
-<!--            <el-col :span="24">
-              <el-form-item label="收货人:" prop="projectname">
-                <el-popover
-                    placement="bottom"
-                    trigger="manual"
-                    v-model="receiptVisible"
-                    width="600">
-                  <seleteReceipt ref="receipt" type="1" @onSelect="receiptChange" @onCanel="receiptVisible = false"></seleteReceipt>
-                  <el-input readonly type="text" slot="reference" size="small" @focus="showChange('receiptVisible')" v-model="form.name"></el-input>
-                </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.phonenumber"></el-input>
-              </el-form-item>
-            </el-col>-->
             <el-col :span="24">
               <el-form-item label="签约日期:" prop="signdate">
                 <el-date-picker
                   v-model="form.signdate"
                   value-format="yyyy-MM-dd"
                   type="date"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -441,15 +391,6 @@
                   trigger="manual"
                   v-model="accountVisible"
                   width="600">
-<!--                  <selectAgent type="2" ref="member" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>-->
-<!--                  <el-tabs v-model="activeName"  type="border-card" @tab-click="tabClick">
-                    <el-tab-pane label="客户" name="客户">
-                      <selectAgent ref="member" type="7" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
-                    </el-tab-pane>
-                    <el-tab-pane label="经销商" name="经销商">
-                      <selectAgent ref="member" type="5" typemx="工具使用(借用)协议" :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
-                    </el-tab-pane>
-                  </el-tabs>-->
                   <el-tabs v-model="activeName" @tab-click="tabClick">
                     <el-tab-pane label="客户" name="客户">
                       <selectAgent ref="member" type="19"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
@@ -458,7 +399,6 @@
                       <selectAgent ref="member" type="20"  :param="agentListPrams" :radio="true" @onSelect="accountChange" @onCancel="accountVisible = false"></selectAgent>
                     </el-tab-pane>
                   </el-tabs>
-<!--                  <selectAgent ref="member" type="10"  :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" placeholder="请选择企业"></el-input>
                 </el-popover>
               </el-form-item>
@@ -481,7 +421,7 @@
                   v-model="form.signdate"
                   value-format="yyyy-MM-dd"
                   type="date"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -528,7 +468,7 @@
 
                   <el-input readonly type="text" slot="reference" size="small" @focus="showChange('accountVisible')" v-model="form.enterprisename">
                     <template slot="append">
-                      <el-button size="small" @click="accountVisible = false;form.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">{{$t('清空')}}</el-button>
+                      <el-button size="small" @click="accountVisible = false;form.enterprisename = '';agentListPrams.content.where.condition = '';$refs.member.selected = []" style="width:100%" type="primary">清空</el-button>
                     </template>
                   </el-input>
                 </el-popover>
@@ -547,7 +487,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('项目名称')+':'" prop="projectnum">
+              <el-form-item label="项目名称:" prop="projectnum">
                 <el-input disabled type="text" size="small" v-model="form.projectname"></el-input>
               </el-form-item>
             </el-col>
@@ -557,7 +497,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item :label="$t('客户名称')+':'" :rules="{ required: false, message: '请选择客户', trigger: 'change,blur' }">
+              <el-form-item label="客户名称:" :rules="{ required: false, message: '请选择客户', trigger: 'change,blur' }">
                 <el-input disabled type="text" size="small" v-model="form.customername" placeholder="客户名称"></el-input>
               </el-form-item>
             </el-col>
@@ -580,7 +520,7 @@
                   v-model="form.signdate"
                   value-format="yyyy-MM-dd"
                   type="date"
-                  :placeholder="$t('选择日期')">
+                  placeholder="选择日期">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -622,8 +562,8 @@
         </el-row>
       </div>
         <div class="fixed__btn__panel">
-          <el-button size="small" @click="onCancel" class="normal-btn-width">{{$t('取 消')}}</el-button>
-          <el-button size="small" type="primary" :loading="loading" @click="onSubmit" class="normal-btn-width">{{$t('确 定')}}</el-button>
+          <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="primary" :loading="loading" @click="onSubmit" class="normal-btn-width">确 定</el-button>
         </div>
     </el-drawer>
   </div>
@@ -655,7 +595,7 @@ export default {
     }
     var NumberSize = (rule, value, callback) => {
       if (isNaN(parseFloat(value)) && value !== ''){
-        return callback(new Error(this.$t('输入不合法，请输入数值') ))
+        return callback(new Error('输入不合法，请输入数值'))
       }else if (+value > 100 || +value <= 0 && value) {
         return callback(new Error('折扣范围(1-100%)'));
       }
@@ -875,8 +815,8 @@ export default {
                 contract = this.$refs.projectContract.ENlist
                 .find(item => item.sa_contractid == this.form.ascription_contractid)
               if (isChange) {
-                this.$confirm('当前项目已存在此居间商，不可编辑',this.$t('提示'),{
-                  cancelButtonText:this.$t('取消'),
+                this.$confirm('当前项目已存在此居间商，不可编辑','提示',{
+                  cancelButtonText:'取消',
                   showConfirmButton:false
                 }).then(() => {
                   this.$store.commit('setLoading',false)
@@ -970,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 !== ''){
 
@@ -1067,7 +1000,7 @@ export default {
     },
     projectChange (data) {
       if (this.$route.query.type == '直销项目' || this.$route.query.type == '经销项目') {
-        this.$confirm('变更项目并保存后,将清空"产品清单"并重新拉取,确定执行吗?',this.$t('提示'),{
+        this.$confirm('变更项目并保存后,将清空"产品清单"并重新拉取,确定执行吗?','提示',{
           "confirmButtonText":"确定",
           "cancelButtonText":"取消",
           "type":"warning"
@@ -1151,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
@@ -66,7 +65,6 @@ export default {
       }
 
       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)