Browse Source

报价单合同产品类别折扣调整查询调整

qymljy 2 years ago
parent
commit
f21bae5dad

+ 43 - 50
src/Form/marketing2/agent/add.vue

@@ -3,8 +3,8 @@
     <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">
       <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" >
+      <el-row :gutter="20"  >
+        <el-form :model="form" ref="form" :rules="rules" 	 size="small" label-position="right" label-width="109px" >
           <el-col :span="24">
             <p class="normal-title normal-margin">企业信息</p>
           </el-col>
@@ -41,42 +41,43 @@
             <p class="normal-title normal-margin">合作伙伴信息</p>
           </el-col>
           <el-col :span="12">
-            <el-form-item v-if="form.cooperationstatus === '正式'" label="合作伙伴编号:" prop="agentnum" :rules="{required:true,message:'请输入合作伙伴编号',trigger:'blur'}">
+            <el-form-item label="合作状态:" prop="cooperationstatus">
+              <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 100%"  @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>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item v-if="form.cooperationstatus === '正式'" label-width="110px" 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-form-item v-else label="合作伙伴编号:" prop="agentnum" label-width="110px" :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 v-if="form.cooperationstatus === '正式'" label="erp编号:" prop="erpagentnum" :rules="{required:true,message:'请输入erp编号',trigger:'blur'}">
+            <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-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>
           <el-col :span="12">
-            <el-form-item label="签约日期:">
-              <el-date-picker
-                style="width:100%"
-                v-model="form.signdate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="合作伙伴类型:" prop="type">
+            <el-form-item label="合作伙伴类型:" label-width="110px" prop="type">
               <el-select
                   ref="sle"
                   style="width:100%;"
                   v-model="form.type"
                   multiple
-                  placeholder="请选择合作伙伴类"
+                  placeholder="请选择合作伙伴类型"
                   size="mini"
               >
                 <el-option
@@ -85,20 +86,31 @@
                     :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-col :span="12" >
+            <el-form-item label="签约日期:">
+              <el-date-picker
+                  style="width:100%"
+                  v-model="form.signdate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业等级:">
+              <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
                 <el-option
-                    v-for="item in cooperationstatus"
-                    :key="item.label"
-                    :label="item.label"
-                    :value="item.label">
+                    v-for="item in agent_level"
+                    :key="item.value"
+                    :label="item.remarks"
+                    :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                 </el-option>
               </el-select>
             </el-form-item>
@@ -109,37 +121,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-          <el-form-item label="上级合作伙伴:">
-            <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
-          </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业等级">
-              <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
-                <el-option
-                  v-for="item in agent_level"
-                  :key="item.value"
-                  :label="item.remarks"
-                  :value="item.value">
-                  <span style="float: left">{{ item.value }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
-                </el-option>
-              </el-select>
+            <el-form-item label="上级合作伙伴:">
+              <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
             </el-form-item>
           </el-col>
           <el-col :span="12" style="height:51px">
-            <el-form-item label="开票节点" prop="invoicingpoint">
+            <el-form-item label="开票节点:" prop="invoicingpoint">
               <el-radio-group v-model="form.invoicingpoint">
                 <el-radio :label="1">订单审核</el-radio>
                 <el-radio :label="2">发货</el-radio>
               </el-radio-group>
             </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>

+ 410 - 0
src/Form/marketing2/agent/addCopy.vue

@@ -0,0 +1,410 @@
+<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">
+      <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" >
+          <el-col :span="24">
+            <p class="normal-title normal-margin">企业信息</p>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业名称:" prop="enterprisename">
+              <enterprise ref="ent" @rowClick="chooseEnterprise" type="3"></enterprise>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="省市县:">
+<!--              <p class="enterpriseText">{{enterprise.province?enterprise.province:''}}</p>-->
+              <el-input v-model="enterprise.province" disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系人:">
+              <el-input v-model="enterprise.contact" disabled></el-input>
+<!--              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:''}}</p>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="联系方式:">
+              <el-input v-model="enterprise.phonenumber" disabled></el-input>
+<!--              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:''}}</p>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="详细地址:">
+              <el-input v-model="enterprise.address" disabled></el-input>
+<!--              <p class="enterpriseText">{{enterprise.address?enterprise.address:''}}</p>-->
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <p class="normal-title normal-margin">合作伙伴信息</p>
+          </el-col>
+          <el-col :span="12">
+            <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 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>
+          <el-col :span="12">
+            <el-form-item label="签约日期:">
+              <el-date-picker
+                style="width:100%"
+                v-model="form.signdate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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="12">
+            <el-form-item label="合作状态:" prop="cooperationstatus">
+              <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 100%" @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>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="可退货天数" prop="limitreturnday">
+              <el-input v-model.number="form.limitreturnday" placeholder="请输入订单可退货天数"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="上级合作伙伴:">
+            <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业等级">
+              <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
+                <el-option
+                  v-for="item in agent_level"
+                  :key="item.value"
+                  :label="item.remarks"
+                  :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="height:51px">
+            <el-form-item label="开票节点" prop="invoicingpoint">
+              <el-radio-group v-model="form.invoicingpoint">
+                <el-radio :label="1">订单审核</el-radio>
+                <el-radio :label="2">发货</el-radio>
+              </el-radio-group>
+            </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-radio-group v-model="radio" @change="radioChange">
+                <el-radio :label="-1">不免费运费</el-radio>
+                <el-radio :label="0">免运费</el-radio>
+                <el-radio :label="1">其他</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="radio === 1">
+            <el-form-item label="免运费额度" prop="freefreightamount">
+              <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-form>
+      </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import enterprise from '@/template/enterprise/index.vue'
+import selectAgent from '@/components/selectAgent/index.vue'
+export default {
+  data () {
+    return {
+      radio:-1,
+      title:'选择上级合作伙伴',
+      rules: {
+        enterprisename: [
+          { required: true, message: '请输入企业名称', trigger: 'blur' },
+        ],
+        // agentnum: [
+        //   { required: true, message: '请输入经销商编号', trigger: 'blur' },
+        // ],
+        type: [
+          { required: true, message: '请选择合作伙伴类型', 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:{
+        "enterprisename": "",
+        "sa_agentsid": '',
+        "parentid": "",
+        "agentnum": "",
+        "signdate": "",
+        "grade": "",
+        "sys_enterpriseid": '',
+        "sa_saleareaids": [
+
+        ],
+        "type": [],
+        'cooperationstatus':'正式',
+        "erpagentnum": "",
+        "isservice": 0, //是否服务商,0或1
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点(1:订单审核:2:发货)
+        "saleclassauth": 1, //是否需要经营授权,默认1
+        "grade":''
+      },
+      ENlist:[],
+      agent_level:[],
+      arealist:[],
+      agent_type:[],
+      enterprise:{},
+      timer:0
+    }
+  },
+  components:{
+    enterprise,
+    selectAgent
+  },
+  methods:{
+    onShow () {
+      this.dialogVisible = true
+      this.cooperationstatus === '正式' ? this.fill = true : this.fill = false
+      this.query_sysoptions()
+      this.query_arealist()
+    },
+    async queryEnterpriseArchives () {
+      const res = await this.$api.requested({
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": this.form.enterprisename
+          }
+        }
+      })
+      this.ENlist = res.data
+    },
+    async query_arealist (callback) {
+      const res = await this.$api.requested({
+        "classname": "webmanage.sale.salearea.salearea",
+        "method": "query_area",
+        "content": {
+        }
+      })
+      this.arealist = this.createList(res.data)
+    },
+    createList (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        if (node.subarea && node.subarea.length > 0) {
+          for (var index = 0; index < node.subarea.length; index++) {
+            convertToElementTree(node.subarea[index])
+          }
+        } else {
+          node.subarea = null
+        }
+        return node;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
+    async query_sysoptions () {
+      const res = await this.$store.dispatch('optiontypeselect','agentgrade')
+      this.agent_level = res.data
+      const res1 = await this.$store.dispatch('optiontypeselect','agenttypemx')
+      this.agent_type = res1.data
+    },
+    onSubmit () {
+      this.$refs['form'].validate(async (valid) => {
+          if (!valid) return false
+          const res = await this.$api.requested({
+            "classname": "webmanage.sale.agents.agents",
+            "method": "insertormodify_agent",
+            "content": this.form
+          })
+          this.tool.showMessage(res,()=>{
+            this.$emit('onSuccess')
+            // this.$refs['form'].resetFields();
+            this.dialogVisible = false
+          })
+      })
+    },
+    radioChange (val) {
+      switch (val) {
+        case -1:
+          this.form.freefreightamount = -1
+          break;
+        case 0:
+          this.form.freefreightamount = 0
+          break;
+        default:
+          this.form.freefreightamount = ''
+          break;
+      }
+    },
+    onChange () {
+      this.visible = true
+      this.debounce(this.queryEnterpriseArchives,500)()
+    },
+    onCascaderChange (value) {
+      this.form.sa_saleareaid = value.at(-1)
+    },
+    debounce (fn, wait) {
+      return function () {
+        if (this.timer !== null) clearTimeout(this.timer)
+        this.timer = setTimeout(fn, wait)
+      }
+    },
+    chooseEnterprise (item) {
+      this.visible = false
+      this.form.enterprisename = item.enterprisename
+      this.form.sys_enterpriseid = item.sys_enterpriseid
+      item.province = `${item.province}-${item.city}-${item.county}`
+      this.enterprise = item
+    },
+    selectAgent (data) {
+      this.form.parentid = data.sa_agentsid
+    },
+    onClose () {
+      this.$refs['ent'].form = {}
+      this.form = {
+        "enterprisename": "",
+        "sa_agentsid": '',
+        "parentid": "",
+        "agentnum": "",
+        "signdate": "",
+        "grade": "",
+        "sys_enterpriseid": '',
+        "sa_saleareaids": [
+
+        ],
+        'cooperationstatus':'正式',
+        "type": [],
+        "erpagentnum": "",
+        "isservice": 1, //是否服务商,0或1
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点(1:订单审核:2:发货)
+        "saleclassauth": 1, //是否需要经营授权,默认1
+        "grade":''
+      },
+      this.enterprise = {}
+    },
+    cooperationstatusChange(){
+      if (this.form.cooperationstatus === '正式'){
+        this.fill = true
+      }else {
+        this.fill = false
+      }
+    }
+  },
+  
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.enterprisePanel {
+  max-height: 400px;
+  overflow-y: scroll;
+}
+.enterprisePanel li{
+  padding: 10px;
+  cursor: pointer;
+  line-height: 25px;
+}
+.enterprisePanel li small{
+  color: #999;
+}
+.enterprisePanel li:hover{
+  background: #f1f2f3;
+}
+.enterpriseText{
+  height: 34px;
+  line-height: 34px;
+  /* font-weight: 500; */
+}
+</style>

+ 69 - 75
src/Form/marketing2/agent/edit.vue

@@ -53,6 +53,18 @@
             <el-col :span="24">
               <p class="normal-title normal-margin">合作伙伴信息</p>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="合作状态:" prop="cooperationstatus">
+                <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 100%" @change="cooperationstatusChange" :disabled="data.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="agentnum" v-if="form.cooperationstatus === '正式'" :rules="{required:true,message:'请输入合作伙伴编号',trigger:'blur'}">
                 <el-input :disabled="true" v-model="form.agentnum" placeholder="输入合作伙伴编号"></el-input>
@@ -69,17 +81,6 @@
                 <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="签约日期">
-                <el-date-picker
-                  style="width:100%"
-                  v-model="form.signdate"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
             <el-col :span="12">
               <el-form-item label="合作伙伴类型:" prop="type">
                 <el-select
@@ -102,75 +103,68 @@
                 </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="data.cooperationstatus === '正式'">
+            <el-col :span="12">
+              <el-form-item label="签约日期">
+                <el-date-picker
+                    style="width:100%"
+                    v-model="form.signdate"
+                    type="date"
+                    value-format="yyyy-MM-dd"
+                    placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业等级">
+                <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
                   <el-option
-                      v-for="item in cooperationstatus"
-                      :key="item.label"
-                      :label="item.label"
-                      :value="item.label">
+                      v-for="item in agent_level"
+                      :key="item.value"
+                      :label="item.remarks"
+                      :value="item.value">
+                    <span style="float: left">{{ item.value }}</span>
+                    <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
                   </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>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-          <el-form-item label="上级合作伙伴:">
-            <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
-          </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="企业等级">
-              <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
-                <el-option
-                  v-for="item in agent_level"
-                  :key="item.value"
-                  :label="item.remarks"
-                  :value="item.value">
-                  <span style="float: left">{{ item.value }}</span>
-                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" style="height:51px">
-            <el-form-item label="开票节点" prop="invoicingpoint">
-              <el-radio-group v-model="form.invoicingpoint">
-                <el-radio :label="1">订单审核</el-radio>
-                <el-radio :label="2">发货</el-radio>
-              </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="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-radio-group v-model="radio" @change="radioChange">
-                <el-radio :label="-1">不免费运费</el-radio>
-                <el-radio :label="0">免运费</el-radio>
-                <el-radio :label="1">其他</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" v-if="radio === 1">
-            <el-form-item label="免运费额度" prop="freefreightamount">
-              <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
-            </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>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="上级合作伙伴:">
+                <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" style="height:51px">
+              <el-form-item label="开票节点" prop="invoicingpoint">
+                <el-radio-group v-model="form.invoicingpoint">
+                  <el-radio :label="1">订单审核</el-radio>
+                  <el-radio :label="2">发货</el-radio>
+                </el-radio-group>
+              </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-radio-group v-model="radio" @change="radioChange">
+                  <el-radio :label="-1">不免费运费</el-radio>
+                  <el-radio :label="0">免运费</el-radio>
+                  <el-radio :label="1">其他</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12" v-if="radio === 1">
+              <el-form-item label="免运费额度" prop="freefreightamount">
+                <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>

+ 432 - 0
src/Form/marketing2/agent/editCopy.vue

@@ -0,0 +1,432 @@
+<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">
+      <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">
+            <el-col :span="24">
+              <p class="normal-title normal-margin">企业信息</p>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="企业名称:" prop="enterprisename">
+                <el-popover
+                  placement="bottom"
+                  width="100%"
+                  v-model="visible">
+                  <div>
+                    <ul class="enterprisePanel">
+                      <li v-for="item in ENlist" :key="item.sys_enterpriseid" @click="chooseEnterprise(item)">
+                        <p>{{item.enterprisename}}</p>
+                        <small>{{item.province}}-{{item.city}}-{{item.county}}</small>
+                      </li>
+                    </ul>
+                  </div>
+                  <el-input readonly slot="reference" v-model="form.enterprisename" @focus="queryEnterpriseArchives" @input.native="onChange"  placeholder="输入企业名称" clearable></el-input>
+                </el-popover>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="省市县:">
+                <!--              <p class="enterpriseText">{{enterprise.province?enterprise.province:''}}</p>-->
+                <el-input v-model="enterprise.province" disabled></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系人:">
+                <el-input v-model="enterprise.contact" disabled></el-input>
+                <!--              <p class="enterpriseText">{{enterprise.contact?enterprise.contact:''}}</p>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="联系方式:">
+                <el-input v-model="enterprise.phonenumber" disabled></el-input>
+                <!--              <p class="enterpriseText">{{enterprise.phonenumber?enterprise.phonenumber:''}}</p>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="详细地址:">
+                <el-input v-model="enterprise.address" disabled></el-input>
+                <!--              <p class="enterpriseText">{{enterprise.address?enterprise.address:''}}</p>-->
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <p class="normal-title normal-margin">合作伙伴信息</p>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="合作伙伴编号" prop="agentnum" v-if="form.cooperationstatus === '正式'" :rules="{required:true,message:'请输入合作伙伴编号',trigger:'blur'}">
+                <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 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>
+            <el-col :span="12">
+              <el-form-item label="签约日期">
+                <el-date-picker
+                  style="width:100%"
+                  v-model="form.signdate"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="选择日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <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="12">
+              <el-form-item label="合作状态:" prop="cooperationstatus">
+                <el-select v-model="form.cooperationstatus" placeholder="请选择" style="width: 100%" @change="cooperationstatusChange" :disabled="data.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>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+          <el-form-item label="上级合作伙伴:">
+            <selectAgent ref="agent" @selectAgent="selectAgent" :title="title"></selectAgent>
+          </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="企业等级">
+              <el-select size="small" style="width:100%" v-model="form.grade" placeholder="请选择">
+                <el-option
+                  v-for="item in agent_level"
+                  :key="item.value"
+                  :label="item.remarks"
+                  :value="item.value">
+                  <span style="float: left">{{ item.value }}</span>
+                  <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?item.remarks:'暂无描述' }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="height:51px">
+            <el-form-item label="开票节点" prop="invoicingpoint">
+              <el-radio-group v-model="form.invoicingpoint">
+                <el-radio :label="1">订单审核</el-radio>
+                <el-radio :label="2">发货</el-radio>
+              </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="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-radio-group v-model="radio" @change="radioChange">
+                <el-radio :label="-1">不免费运费</el-radio>
+                <el-radio :label="0">免运费</el-radio>
+                <el-radio :label="1">其他</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-if="radio === 1">
+            <el-form-item label="免运费额度" prop="freefreightamount">
+              <el-input v-model.number="form.freefreightamount" placeholder="请输入免运费额度"></el-input>
+            </el-form-item>
+          </el-col>
+            
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="warning" @click="onSubmit" class="normal-btn-width btn-warning">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import selectAgent from '@/components/selectAgent/index.vue'
+
+export default {
+  props:['data','btnType'],
+  data () {
+    return {
+      rules: {
+        enterprisename: [
+          { required: true, message: '请输入企业名称', trigger: ['blur', 'change'] },
+        ],
+        // agentnum: [
+        //   { required: true, message: '请输入经销商编号', trigger: 'blur' },
+        // ],
+        sa_saleareaids: [
+          { required: true, message: '请输入合作伙伴编号', trigger: 'change' },
+        ],
+        type: [
+          { required: true, message: '请选择合作伙伴类型', 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:{
+        "enterprisename": "",
+        "sa_agentsid": '',
+        "parentid": "",
+        "agentnum": "",
+        "signdate": "",
+        "grade": "",
+        "sys_enterpriseid": '',
+        "sa_saleareaids": [
+
+        ],
+        "type": [],
+        'cooperationstatus':'正式',
+        "erpagentnum": "",
+        "isservice": 0, //是否服务商,0或1
+        "limitreturnday": "", //订单可退货天数
+        "freefreightamount": "", //免运费额度
+        "latitude": "", //纬度
+        "longitude": "", //经度
+        "invoicingpoint": 1, //开票节点(1:订单审核:2:发货)
+        "saleclassauth": 1, //是否需要经营授权,默认1
+        "grade":''
+      },
+      ENlist:[],
+      agent_level:[],
+      arealist:[],
+      agent_type:[],
+      enterprise:{},
+      timer:0,
+      radio:-1,
+      title:'选择上级合作伙伴',
+    }
+  },
+  components:{
+    selectAgent
+  },
+  methods:{
+    onShow () {
+      this.dialogVisible = true
+      this.cooperationstatus === '正式' ? this.fill = true : this.fill = false
+      this.query_sysoptions()
+      this.query_arealist()
+      this.queryMain()
+    },
+    async queryMain() {
+      const res = await this.$api.requested({
+        "classname": "webmanage.sale.agents.agents",
+        "method": "query_agentMain",
+        "content": {
+          "sa_agentsid": this.data.sa_agentsid
+        }
+      })
+      this.$refs.agent.value.enterprisename = res.data.parent_enterprisename
+      res.data.sa_saleareaids?res.data.sa_saleareaids = JSON.parse(res.data.sa_saleareaids):''
+      this.form = Object.assign({},this.form,res.data)
+      this.enterprise = Object.assign({},this.form,res.data)
+      if (this.form.province) {
+        this.form.province = [this.form.province,this.form.city,this.form.county]
+      }
+      if (!this.form.grade) this.form.grade = ''
+      switch (this.form.freefreightamount) {
+        case -1:
+          this.radio = -1
+          break;
+        case 0:
+          this.radio = 0
+          break;
+        default:
+          this.radio = 1
+          break;
+      }
+    },
+    async queryEnterpriseArchives () {
+      const res = await this.$api.requested({
+        "id": 20220920083901,
+        "content": {
+          "pageNumber": 1,
+          "pageSize": 20,
+          "where": {
+            "condition": this.form.enterprisename
+          }
+        }
+      })
+      this.ENlist = res.data
+    },
+    async query_arealist (callback) {
+      const res = await this.$api.requested({
+        "classname": "webmanage.sale.salearea.salearea",
+        "method": "query_area",
+        "content": {
+        }
+      })
+      this.arealist = this.createList(res.data)
+    },
+    createList (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        if (node.subarea && node.subarea.length > 0) {
+          for (var index = 0; index < node.subarea.length; index++) {
+            convertToElementTree(node.subarea[index])
+          }
+        } else {
+          node.subarea = null
+        }
+        return node;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
+    async query_sysoptions () {
+      const res = await this.$store.dispatch('optiontypeselect','agentgrade')
+      this.agent_level = res.data
+      const res1 = await this.$store.dispatch('optiontypeselect','agenttypemx')
+      this.agent_type = res1.data
+    },
+    radioChange (val) {
+      switch (val) {
+        case -1:
+          this.form.freefreightamount = -1
+          break;
+        case 0:
+          this.form.freefreightamount = 0
+          break;
+        default:
+          this.form.freefreightamount = ''
+          break;
+      }
+    },
+    onSubmit () {
+      this.$refs['form'].validate(async (valid) => {
+          if (!valid) return false
+          const res = await this.$api.requested({
+            "classname": "webmanage.sale.agents.agents",
+            "method": "insertormodify_agent",
+            "content": this.form
+          })
+          this.tool.showMessage(res,()=>{
+            this.$emit('onSuccess')
+            // this.$refs['form'].resetFields();
+            this.dialogVisible = false
+          })
+      })
+    },
+    onChange () {
+      this.visible = true
+      this.debounce(this.queryEnterpriseArchives,1000)()
+    },
+    onCascaderChange (value) {
+      this.form.sa_saleareaid = value.at(-1)
+    },
+    debounce (fn, wait) {
+      return function () {
+        if (this.timer !== null) clearTimeout(this.timer)
+        this.timer = setTimeout(fn, wait)
+      }
+    },
+    chooseEnterprise (item) {
+      this.visible = false
+      this.form.enterprisename = item.enterprisename
+      this.form.enterpriseid = item.enterpriseid
+
+      item.province = `${item.province}-${item.city}-${item.county}`
+      this.enterprise = item
+    },
+    selectAgent (data) {
+      this.form.parentid = data.sa_agentsid
+    },
+    cooperationstatusChange(){
+      if (this.form.cooperationstatus === '正式'){
+        this.fill = true
+      }else {
+        this.fill = false
+      }
+    }
+   
+  },
+  
+}
+
+</script>
+<style>
+</style>
+<style scoped>
+.enterprisePanel {
+  max-height: 400px;
+  overflow-y: scroll;
+}
+.enterprisePanel li{
+  padding: 10px;
+  cursor: pointer;
+  line-height: 25px;
+}
+.enterprisePanel li small{
+  color: #999;
+}
+.enterprisePanel li:hover{
+  background: #f1f2f3;
+}
+.enterpriseText{
+  height: 34px;
+  line-height: 34px;
+}
+.gz-form-row{
+  display: flex;
+  flex-wrap: wrap;
+}
+</style>

+ 6 - 1
src/HDrpManagement/contractManage/components/itemClass/add.vue

@@ -78,7 +78,7 @@
         <div class="flex-align-center flex-between ">
           <slot name="operation"></slot>
           <div class="flex-align-center">
-            <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="类别名称" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
+            <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="编号、类别名称、品牌" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
           </div>
           <div style="margin-top:-10px;margin-bottom: 10px;float: right">
             <el-button style="float: right" type="primary" size="mini" @click="itemClassSelect" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
@@ -108,6 +108,11 @@
                 label="类别名称"
                 width="0">
             </el-table-column>
+            <el-table-column
+                prop="brandname"
+                label="品牌"
+                width="0">
+            </el-table-column>
 <!--            <el-table-column
                 label="品牌名称"
                 width="180">

+ 1 - 1
src/HDrpManagement/contractManage/components/itemClass/index.vue

@@ -7,7 +7,7 @@
           class="inline-16"
           suffix-icon="el-icon-search"
           v-model="param.content.where.condition"
-          placeholder="产品类别名称"
+          placeholder="编号、类别名称、品牌"
           @keyup.enter.native="listData(param.content.pageNumber = 1)"
           @clear="listData(param.content.pageNumber = 1)"
           clearable>

+ 2 - 2
src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -5,7 +5,7 @@
       <div class="container">
         <p class="normal-title normal-margin">产品类别</p>
         <div style="display:flex;justify-content:space-between;align-items:center">
-          <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
+          <el-input size="small" style="width:200px;margin-bottom:10px" v-model="params.content.where.condition" placeholder="编号、类别名称、品牌" @clear="getProductList(params.content.pageNumber = 1)" @keyup.native.enter="getProductList(params.content.pageNumber = 1)" clearable></el-input>
           <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
         </div>
           <Table @selectArr="selectArr" ref="table" id="itemclassid" v-model="itemno" :layout="tablecols" :data="productList" :custom="true" height="500px"  @upDateData="upDateData">
@@ -47,7 +47,7 @@
       
       <div class="fixed__btn__panel">
         <el-button size="small" @click="drawer = false">取 消</el-button>
-        <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>
+<!--        <el-button type="primary" size="small" :disabled="selectProductLength == 0" @click="onSumit">批 量 添 加</el-button>-->
       </div>
     </el-drawer>
   </div>

+ 1 - 1
src/HDrpManagement/contractManage/components/productClassList/productClassList.vue

@@ -2,7 +2,7 @@
   <div>
     <div>
       <div class="flex-align-center" style="margin-bottom:10px">
-        <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="输入搜索内容" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
+        <el-input size="small" style="width:200px;margin-right:10px" v-model="params.content.where.condition" placeholder="编号、类别名称、品牌" @clear="listData(params.content.pageNumber = 1)" @keyup.native.enter="listData(params.content.pageNumber = 1)" clearable></el-input>
         <slot name="addProduct"/>
         <el-button v-if="tool.checkAuth($route.name,'productClassManage') && data.status === '新建' && isLeader" size="small" :type="delProductData.length === 0?'':'primary'" @click="onDelProduct" :disabled="delProductData.length === 0">删 除</el-button>
       </div>

+ 1 - 1
src/HManagement/clueManage/m_activity/modules/addClue.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="primary" :disabled="disabled" size="mini" @click="onShow">新 建</el-button>
+    <el-button type="primary" :disabled="!data.disabled" size="mini" @click="onShow">新 建</el-button>
     <el-drawer
       title="新建线索"
       :visible.sync="drawer"

+ 2 - 2
src/HManagement/clueManage/m_activity/modules/details.vue

@@ -23,9 +23,9 @@
       </div>
       <div slot="slot0" class="container normal-panel">
         <DetailTable ref="DetailTable">
-          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'clueManage')" @onSuccess="$refs.DetailTable.getList();queryMainData()"/>
+          <addClue slot="addClue" :data="mainData" class="inline-16" v-if="tool.checkAuth($route.name,'clueManage') && mainData.status !== '结束' && mainData.disabled"  @onSuccess="$refs.DetailTable.getList();queryMainData()"/>
           <template v-slot:editClue="scope">
-            <editClue  v-if="tool.checkAuth($route.name,'clueManage')" :data="scope.data" @onSuccess="$refs.DetailTable.getList()"/>
+            <editClue  v-if="tool.checkAuth($route.name,'clueManage')" :data="scope.data" :rowData="mainData" @onSuccess="$refs.DetailTable.getList()"/>
           </template>
         </DetailTable>
       </div>

+ 2 - 2
src/HManagement/clueManage/m_activity/modules/editClue.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" :disabled="disabled || data.allocationstatus === '已分配'" size="mini" @click="editBtn">编 辑</el-button>
+    <el-button type="text" :disabled="!rowData.disabled || data.allocationstatus === '已分配' || rowData.status === '结束'" size="mini" @click="editBtn">编 辑</el-button>
     <el-drawer
       title="编辑线索"
       :visible.sync="drawer"
@@ -201,7 +201,7 @@ export default {
       tradefieldSelect:[],
     }
   },
-  props:['data','disabled'],
+  props:['data','disabled','rowData'],
   methods:{
     editBtn () {
       this.drawer = true

+ 8 - 8
src/SDrpManagement/QuotedPrice/detail/modules/itemClass/add.vue

@@ -13,7 +13,7 @@
         <div class="flex-align-center flex-between ">
           <slot name="operation"></slot>
           <div class="flex-align-center">
-            <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
+            <el-input size="small"  suffix-icon="el-icon-search" v-model="params.content.where.condition" placeholder="编号、类别名称、品牌" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
           </div>
           <div style="margin-top:-10px;margin-bottom: 10px;float: right">
             <el-button style="float: right" type="primary" size="mini" @click="batchSelect" :disabled="tableSelectData.length === 0 ">批量添加</el-button>
@@ -43,18 +43,18 @@
                 label="类别名称"
                 width="0">
             </el-table-column>
-<!--            <el-table-column
-                label="品牌名称"
-                width="180">
-              <template slot-scope="scope">
-                <p><span>{{scope.row.model}}</span>&nbsp;/&nbsp;<span>{{scope.row.spec}}</span></p>
-              </template>
-            </el-table-column>-->
             <el-table-column
                 prop="upitemclassname"
                 label="上级类别"
                 width="0">
             </el-table-column>
+            <el-table-column
+                label="品牌名称"
+                width="180">
+              <template slot-scope="scope">
+                <p><span>{{scope.row.brandname}}</span></p>
+              </template>
+            </el-table-column>
             <el-table-column
                 prop="discountrate"
                 label="折扣(%)"

+ 2 - 2
src/SDrpManagement/QuotedPrice/detail/modules/itemClass/index.vue

@@ -3,11 +3,11 @@
     <div style="margin-bottom: 15px">
       <el-input
           size="small"
-          style="width: 200px;"
+          style="width: 230px;"
           class="inline-16"
           suffix-icon="el-icon-search"
           v-model="param.content.where.condition"
-          placeholder="产品名称,编号"
+          placeholder="编号、类别名称、品牌"
           @keyup.enter.native="listData(param.content.pageNumber = 1)"
           @clear="listData(param.content.pageNumber = 1)"
           clearable>