经销商档案改为合作伙伴

src/Form/marketing2/agent/add.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="onShow">新 建</el-button>
-    <el-drawer title="创建经销商" direction="rtl" size="900px" append-to-body :visible.sync="dialogVisible" @close="onClose" :show-close="false">
+    <el-drawer title="创建合作伙伴" direction="rtl" size="900px" append-to-body :visible.sync="dialogVisible" @close="onClose" :show-close="false">
       <div class="drawer__panel">
       <el-row :gutter="20">
-        <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="120px" class="demo-form-inline">
+        <el-form :model="form" ref="form" :rules="rules" :status-icon="false"	 size="small" label-position="right" label-width="120px" >
           <el-col :span="24">
             <p class="normal-title normal-margin">企业信息</p>
           </el-col>
@@ -38,15 +38,23 @@
             </el-form-item>
           </el-col>
           <el-col :span="24">
-            <p class="normal-title normal-margin">经销商信息</p>
+            <p class="normal-title normal-margin">合作伙伴信息</p>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="经销商编号:" prop="agentnum">
-              <el-input v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
+            <el-form-item v-if="form.cooperationstatus === '正式'" label="合作伙伴编号:" prop="agentnum" :rules="{required:true,message:'请输入经销商编号',trigger:'blur'}">
+              <el-input v-model="form.agentnum" placeholder="输入合作伙伴编号"
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-else label="合作伙伴编号:" prop="agentnum" :rules="{required:false,message:'请输入经销商编号',trigger:'blur'}">
+              <el-input v-model="form.agentnum" placeholder="输入合作伙伴编号"
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="erp编号:" prop="erpagentnum">
+            <el-form-item v-if="form.cooperationstatus === '正式'" label="erp编号:" prop="erpagentnum" :rules="{required:true,message:'请输入erp编号',trigger:'blur'}">
+              <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
+            </el-form-item>
+            <el-form-item v-else label="erp编号:" prop="erpagentnum" :rules="{required:false,message:'请输入erp编号',trigger:'blur'}">
               <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
             </el-form-item>
           </el-col>
@@ -62,13 +70,35 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="经销商类型:" prop="type">
-              <el-select style="width:100%" v-model="form.type[0]" placeholder="请选择">
+            <el-form-item label="合作伙伴类型:" prop="type">
+              <el-select
+                  ref="sle"
+                  style="width:100%;"
+                  v-model="form.type"
+                  multiple
+                  placeholder="请选择合作伙伴类别"
+                  size="mini"
+              >
                 <el-option
-                  v-for="item in agent_type"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
+                    v-for="item in agent_type"
+                    :key="item.value"
+                    :label="item.value"
+                    :value="item.value"
+                >
+<!--                  <span style="float: left">{{ item.tag }}</span>-->
+<!--                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>-->
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="13">
+            <el-form-item label="合作状态:" prop="cooperationstatus">
+              <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 90%" @change="cooperationstatusChange">
+                <el-option
+                    v-for="item in cooperationstatus"
+                    :key="item.label"
+                    :label="item.label"
+                    :value="item.label">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -79,7 +109,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="上级经销商:">
+          <el-form-item label="上级合作伙伴:">
             <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
           </el-form-item>
           </el-col>
@@ -105,18 +135,18 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否服务经销商:" prop="isservice">
-              <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="是否服务合作伙伴:" prop="isservice" label-width="200px">-->
+<!--              <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="是否授权所有营销类别:" prop="saleclassauth" label-width="160px">
               <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="是否免运费">
+            <el-form-item label="是否免运费">
               <el-radio-group v-model="radio" @change="radioChange">
                 <el-radio :label="-1">不免费运费</el-radio>
                 <el-radio :label="0">免运费</el-radio>
@@ -147,21 +177,33 @@ export default {
   data () {
     return {
       radio:-1,
-      title:'选择上级经销商',
+      title:'选择上级合作伙伴',
       rules: {
         enterprisename: [
           { required: true, message: '请输入企业名称', trigger: 'blur' },
         ],
-        agentnum: [
-          { required: true, message: '请输入经销商编号', trigger: 'blur' },
-        ],
+        // agentnum: [
+        //   { required: true, message: '请输入经销商编号', trigger: 'blur' },
+        // ],
         type: [
           { required: true, message: '请选择经销商类型', trigger: 'change' },
         ],
-        erpagentnum: [
-          { required: true, message: '请输入erp经销商编号', trigger: 'change' },
+        cooperationstatus: [
+          { required: true, message: '请选择合作状态', trigger: 'change' },
         ],
+        // erpagentnum: [
+        //   { required: true, message: '请输入erp经销商编号', trigger: 'change' },
+        // ],
       },
+      fill:true,
+      cooperationstatus:[
+        {
+          label:'正式'
+        },
+        {
+          label:'意向'
+        },
+      ],
       dialogVisible:false,
       visible:false,
       form:{
@@ -178,7 +220,7 @@ export default {
         "type": [],
         'cooperationstatus':'正式',
         "erpagentnum": "",
-        "isservice": 1, //是否服务商，0或1
+        "isservice": 0, //是否服务商，0或1
         "limitreturnday": "", //订单可退货天数
         "freefreightamount": "", //免运费额度
         "latitude": "", //纬度
@@ -202,6 +244,7 @@ export default {
   methods:{
     onShow () {
       this.dialogVisible = true
+      this.cooperationstatus === '正式' ? this.fill = true : this.fill = false
       this.query_sysoptions()
       this.query_arealist()
     },
@@ -315,7 +358,8 @@ export default {
         "sa_saleareaids": [
 
         ],
-        "type": "",
+        'cooperationstatus':'正式',
+        "type": [],
         "erpagentnum": "",
         "isservice": 1, //是否服务商，0或1
         "limitreturnday": "", //订单可退货天数
@@ -327,6 +371,13 @@ export default {
         "grade":''
       },
       this.enterprise = {}
+    },
+    cooperationstatusChange(){
+      if (this.form.cooperationstatus === '正式'){
+        this.fill = true
+      }else {
+        this.fill = false
+      }
     }
   },
   

src/Form/marketing2/agent/edit.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="onShow">编 辑</el-button>
-    <el-drawer title="编辑经销商" direction="rtl" size="900px" append-to-body :visible.sync="dialogVisible" :show-close="false">
+    <el-drawer title="编辑合作伙伴" direction="rtl" size="900px" append-to-body :visible.sync="dialogVisible" :show-close="false">
       <div class="drawer__panel">
         <el-row :gutter="20">
           <el-form :model="form" ref="form" :rules="rules" size="small" label-position="right" label-width="120px" class="demo-form-inline">
@@ -51,15 +51,21 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <p class="normal-title normal-margin">经销商信息</p>
+              <p class="normal-title normal-margin">合作伙伴信息</p>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="经销商编号" prop="agentnum">
-                <el-input :disabled="true" v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
+              <el-form-item label="合作伙伴编号" prop="agentnum" v-if="form.cooperationstatus === '正式'">
+                <el-input :disabled="true" v-model="form.agentnum" placeholder="输入合作伙伴编号"></el-input>
+              </el-form-item>
+              <el-form-item v-else label="合作伙伴编号" prop="agentnum">
+                <el-input  v-model="form.agentnum" placeholder="输入合作伙伴编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-            <el-form-item label="erp编号:" prop="erpagentnum">
+              <el-form-item v-if="form.cooperationstatus === '正式'" label="erp编号:" prop="erpagentnum" :rules="{required:true,message:'请输入erp编号',trigger:'blur'}">
+                <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
+              </el-form-item>
+              <el-form-item v-else label="erp编号:" prop="erpagentnum" :rules="{required:false,message:'请输入erp编号',trigger:'blur'}">
                 <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
               </el-form-item>
             </el-col>
@@ -75,17 +81,39 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-            <el-form-item label="经销商类型:" prop="type">
-              <el-select style="width:100%" v-model="form.type[0]" placeholder="请选择">
-                <el-option
-                  v-for="item in agent_type"
-                  :key="item.value"
-                  :label="item.value"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+              <el-form-item label="合作伙伴类型:" prop="type">
+                <el-select
+                    ref="sle"
+                    style="width:100%;"
+                    v-model="form.type"
+                    multiple
+                    placeholder="请选择合作伙伴类别"
+                    size="mini"
+                >
+                  <el-option
+                      v-for="item in agent_type"
+                      :key="item.value"
+                      :label="item.value"
+                      :value="item.value"
+                  >
+                    <!--                  <span style="float: left">{{ item.tag }}</span>-->
+                    <!--                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.helptips?item.helptips:'暂无描述' }}</span>-->
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="13">
+              <el-form-item label="合作状态:" prop="cooperationstatus">
+                <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 90%" @change="cooperationstatusChange" :disabled="form.cooperationstatus === '正式'">
+                  <el-option
+                      v-for="item in cooperationstatus"
+                      :key="item.label"
+                      :label="item.label"
+                      :value="item.label">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
           <el-col :span="12">
             <el-form-item label="可退货天数" prop="limitreturnday">
               <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
@@ -118,11 +146,11 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="是否服务经销商:" prop="isservice">
-              <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="是否服务经销商:" prop="isservice">-->
+<!--              <el-checkbox v-model="form.isservice" :true-label="1" :false-label="0"></el-checkbox>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="是否授权所有营销类别:" prop="saleclassauth" label-width="160px">
               <el-checkbox v-model="form.saleclassauth" :true-label="0" :false-label="1"></el-checkbox>
@@ -165,19 +193,31 @@ export default {
         enterprisename: [
           { required: true, message: '请输入企业名称', trigger: ['blur', 'change'] },
         ],
-        agentnum: [
-          { required: true, message: '请输入经销商编号', trigger: 'blur' },
-        ],
+        // agentnum: [
+        //   { required: true, message: '请输入经销商编号', trigger: 'blur' },
+        // ],
         sa_saleareaids: [
-          { required: true, message: '请输入经销商编号', trigger: 'change' },
+          { required: true, message: '请输入合作伙伴编号', trigger: 'change' },
         ],
         type: [
-          { required: true, message: '请选择经销商类型', trigger: 'change' },
+          { required: true, message: '请选择合作伙伴类型', trigger: 'change' },
         ],
-        erpagentnum: [
-          { required: true, message: '请输入erp经销商编号', trigger: 'change' },
+        cooperationstatus: [
+          { required: true, message: '请选择合作状态', trigger: 'change' },
         ],
+        // erpagentnum: [
+        //   { required: true, message: '请输入erp经销商编号', trigger: 'change' },
+        // ],
       },
+      fill:true,
+      cooperationstatus:[
+        {
+          label:'正式'
+        },
+        {
+          label:'意向'
+        },
+      ],
       dialogVisible:false,
       visible:false,
       form:{
@@ -194,7 +234,7 @@ export default {
         "type": [],
         'cooperationstatus':'正式',
         "erpagentnum": "",
-        "isservice": 1, //是否服务商，0或1
+        "isservice": 0, //是否服务商，0或1
         "limitreturnday": "", //订单可退货天数
         "freefreightamount": "", //免运费额度
         "latitude": "", //纬度
@@ -210,7 +250,7 @@ export default {
       enterprise:{},
       timer:0,
       radio:-1,
-      title:'选择上级经销商',
+      title:'选择上级合作伙伴',
     }
   },
   components:{
@@ -219,6 +259,7 @@ export default {
   methods:{
     onShow () {
       this.dialogVisible = true
+      this.cooperationstatus === '正式' ? this.fill = true : this.fill = false
       this.query_sysoptions()
       this.query_arealist()
       this.queryMain()
@@ -349,6 +390,13 @@ export default {
     selectAgent (data) {
       this.form.parentid = data.sa_agentsid
     },
+    cooperationstatusChange(){
+      if (this.form.cooperationstatus === '正式'){
+        this.fill = true
+      }else {
+        this.fill = false
+      }
+    }
    
   },
   

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -3,7 +3,7 @@
   <div>
     <div style="margin-bottom: 15px">
       <addProduct ref="addProduct" @uploadData="uploadData" @closeDrawer="listData"
-                  :tradefield="data.tradefield" v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled && flagTag ===0"
+                  :tradefield="data.tradefield" v-if="tool.checkAuth($route.name,'productSetManage') && data.disabled "
                   class="inline-16" :params="paramsAdd" title="添 加"
                   @addSuccess="addProducts" :discountrate="discountrate" @addProduct="addProduct" :tablecolsAdd="tablecolsAdd"
       ></addProduct>

src/HManagement/marketing2/agent/details/index.vue

@@ -164,7 +164,16 @@ export default {
       })
       this.mainData = res.data
       console.log(this.mainData);
-      
+      let types = ''
+      this.mainData.type.forEach((e,index)=>{
+        if (this.mainData.type.length -1 === index){
+          types = types + e
+        }else {
+          types = types  + e + ','
+        }
+
+      })
+      this.mainData.type = types
       this.$refs['details'].param.content.containssub = 1
       this.$refs['details'].param.content.sa_saleareaids = [this.mainData.sa_saleareaid]
       this.changeDataStructure()
@@ -212,7 +221,7 @@ export default {
         },
         {
           label:'经销商类型',
-          value: this.mainData.type[0]
+          value: this.mainData.type
         },
         {
           label:'上级经销商',

src/components/selectAgent/index.vue

@@ -34,7 +34,7 @@ export default {
   data () {
     return {
       dialogTableVisible:false,
-      placeholder:"选择经销商",
+      placeholder:"选择上级合作伙伴",
       areaInfo:{},
       titleData:'选择人员',
       value:{

vue.config.js

@@ -15,8 +15,8 @@ module.exports = {
       proxy: {
         '/apis': {
           // target: 'http://61.164.207.46:8000',  // target host*/
-          target: 'http://192.168.3.9:8090',  // target host*!
-          // target: 'https://oms.idcgroup.com.cn:8079/',  // target host
+          // target: 'http://192.168.3.9:8090',  // target host*!
+          target: 'https://oms.idcgroup.com.cn:8079/',  // target host
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites