暂存

src/Form/marketing2/agent/add.vue

@@ -46,8 +46,8 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="erp经销商编号:" prop="erpagentnum">
-              <el-input v-model="form.erpagentnum" placeholder="输入erp经销商编号"></el-input>
+            <el-form-item label="erp编号:" prop="erpagentnum">
+              <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">

src/Form/marketing2/agent/edit.vue

@@ -59,8 +59,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-            <el-form-item label="erp经销商编号:" prop="erpagentnum">
-                <el-input v-model="form.erpagentnum" placeholder="输入erp经销商编号"></el-input>
+            <el-form-item label="erp编号:" prop="erpagentnum">
+                <el-input v-model="form.erpagentnum" placeholder="输入erp编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/Form/salerPrivatecustomer/add.vue

@@ -58,6 +58,11 @@
                 <el-input v-model="form.abbreviation" placeholder="请输入企业简称" style="width: 100%"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="erp编号:" prop="abbreviation">
+                <el-input v-model="form.erpagentnum" placeholder="请输入erp编号" style="width: 100%"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24" >
               <el-form-item label="客户类型:" prop="type">
                 <el-select v-model="form.type" placeholder="请选择客户类型" style="width: 100%">
@@ -310,7 +315,8 @@ export default {
         customergrade:"",
         ispublic:0,//1:公海客户，0：私域客户，自己新建的
         telephone: "",
-        sa_agentsid: ""
+        sa_agentsid: "",
+        erpagentnum:""
       },
       value:'',
       options:{

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -79,9 +79,17 @@ export default {
           label:'是否上架',
           value:this.mainData.isonsale ? '上架' : '下架'
         },
-        {
+        /*{
           label:'默认展示产品',
           value:this.mainData.itemname
+        },*/
+        {
+          label:'默认展示产品编码',
+          value:this.mainData.itemno
+        },
+        {
+          label:'默认展示产品名称',
+          value:this.mainData.itemname
         },
         /*{
           label:'产品类别',

src/HDrpManagement/orderManage/details/export_excel.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <el-button type="primary" size="small" @click="submit()" plain style="margin-bottom: 10px;margin-top: -10px">导 出</el-button>
+    <el-button type="primary" size="small" @click="submit()" plain >导 出</el-button>
   </div>
 </template>
 
 <script>
 export default {
-  props:['tablecols','param','excelTitle','total'],
+  props:['tablecols','param','excelTitle','total','specialKey'],
   data () {
     return {}
   },
@@ -14,26 +14,30 @@ export default {
     async submit () {
       let data = {}
       // 如果传入了total,需要赋值保证数量准确性
+      // data = Object.assign({},data,this.param)
+      data = JSON.parse(JSON.stringify(this.param))
       if (this.total) {
-        this.param.content.pageSize = this.total
+        data.content.pageSize = this.total
       }
-      data = JSON.parse(JSON.stringify(this.param))
+      data.content.isAll = false
 
-      data.content.isAll = true
       const res = await this.$api.requested(data)
-      console.log(res,"res111")
+
+      if (this.specialKey){
+        res.data.forEach(e=>{
+          this.specialKey.forEach(s=>{
+            e[s.key] = e[s.key]? e[s.key]:[]
+            e[s.key] = e[s.key].map(k=>{return s.value?k[s.value]:k}).toString()
+          })
+        })
+      }
+
       let table = JSON.parse(JSON.stringify(this.tablecols))
       table.forEach((e,index) => {
         // 由于表格数据结构问题这里需要判断一下
-       /* console.log(res)*/
-        console.log(index)
         if (e.title === '省市县') {
           table[index].title = '省'
           table.splice(index + 1,0,{title:'市',columnname:'city'},{title:'县',columnname:'county'})
-        }else if(e.title === '型号/规格'){
-          res.data.forEach(e => {
-            e.model = e.model + '/' + e.spec
-          })
         }else if(e.title === '需求日期'){
           res.data.forEach(e => {
             if (e.delivery === 0){
@@ -50,9 +54,9 @@ export default {
               e.deliverydate = e.deliverydate
             }
           })
-        }else if(e.title === '小计'){
+        }else if(e.title === '型号/规格'){
           res.data.forEach(e => {
-            e.totalprice = e.price * e.qty
+            e.model = e.model + '/' + e.spec
           })
         }
       });

src/HDrpManagement/orderManage/details/export_excelCopy.vue

@@ -0,0 +1,72 @@
+<template>
+  <div>
+    <el-button type="primary" size="small" @click="submit()" plain style="margin-bottom: 10px;margin-top: -10px">导 出</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['tablecols','param','excelTitle','total'],
+  data () {
+    return {}
+  },
+  methods:{
+    async submit () {
+      let data = {}
+      // 如果传入了total,需要赋值保证数量准确性
+      if (this.total) {
+        this.param.content.pageSize = this.total
+      }
+      data = JSON.parse(JSON.stringify(this.param))
+
+      data.content.isAll = true
+      const res = await this.$api.requested(data)
+      console.log(res,"res111")
+      let table = JSON.parse(JSON.stringify(this.tablecols))
+      table.forEach((e,index) => {
+        // 由于表格数据结构问题这里需要判断一下
+       /* console.log(res)*/
+        console.log(index)
+        if (e.title === '省市县') {
+          table[index].title = '省'
+          table.splice(index + 1,0,{title:'市',columnname:'city'},{title:'县',columnname:'county'})
+        }else if(e.title === '型号/规格'){
+          res.data.forEach(e => {
+            e.model = e.model + '/' + e.spec
+          })
+        }else if(e.title === '需求日期'){
+          res.data.forEach(e => {
+            if (e.delivery === 0){
+              e.needdate = '不管控交期'
+            }else {
+              e.needdate = e.needdate
+            }
+          })
+        }else if(e.title === '回复交期'){
+          res.data.forEach(e => {
+            if (e.delivery === 0){
+              e.deliverydate = '不管控交期'
+            }else {
+              e.deliverydate = e.deliverydate
+            }
+          })
+        }else if(e.title === '小计'){
+          res.data.forEach(e => {
+            e.totalprice = e.price * e.qty
+          })
+        }
+      });
+      let hd = table.map(e=>{
+        return e.title
+      })
+      let ft = table.map(e=>{
+        return e.columnname
+      })
+      this.tool.exportExcel(hd,ft,res.data,this.excelTitle)
+    }
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -2,9 +2,9 @@
   <el-row :gutter="10">
     <el-col :span="setcol">
       <div class="flex-align-center">
-        <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
         <slot name="operation"></slot>
         <el-button style="margin:0 0 10px 10px" size="small" type="primary" :disabled="data.status !== '新建'" v-if="type !== 'confirmdate'" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
+        <excel style="margin:0 0 10px 10px" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
       </div>
       <el-table
         ref="multipleTable"
@@ -175,9 +175,9 @@
         </el-table-column> -->
         <el-table-column
           label="折后金额"
-          prop="totalprice">
+          prop="amount">
           <template slot-scope="scope">
-            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
+            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.amount,2)}}</p>
           </template>
         </el-table-column>
         <el-table-column

src/HManagement/clueManage/clue_private/index.vue

@@ -13,6 +13,7 @@
       :apiId="{query:20221101094302,del:20221101100502}" 
       :options="options"
       :detailPath="{path:'/clueDetail_private'}"
+      :specialKey="[{key:'leader',value:'name'}]"
       @listCreate="list"
       @listData="listdata"
     >
@@ -58,7 +59,7 @@
           <span style="color:#fa8c16" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '已转化'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span v-else>{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
         </div>
-        <div v-else-if="scope.data.column.columnname == 'leadername'">
+        <div v-else-if="scope.data.column.columnname == 'leader'">
           <span>
             {{scope.data.column.data.allocationstatus === '已分配'?scope.data.column.data.leader[0] && scope.data.column.data.leader[0].name:'--'}}
           </span>

src/HManagement/clueManage/clue_public/index.vue

@@ -34,9 +34,9 @@
           {{scope.data.column.data.province}}-{{scope.data.column.data.city}}-{{scope.data.column.data.county}}
         </div>
         <div v-else>
-          {{scope.data.column.data[[scope.data.column.columnname]]}}
+          {{scope.data.column.data[[scope.data.column.columnname]] || '--'}}
         </div>
-        <span v-if="!scope.data.column.data[scope.data.column.columnname] ">--</span>
+<!--        <span v-if="!scope.data.column.data[scope.data.column.columnname] ">&#45;&#45;</span>-->
       </template>
     </basicLayout>
   </div>

src/HManagement/clueManage/m_activity/index.vue

@@ -12,6 +12,7 @@
       :apiId="{query:20221101095102,del:''}" 
       :options="options"
       :detailPath="{path:'/marketing_activityDetails',param:{tabIndex:tabIndex}}"
+      :specialKey="[{key:'leader',value:'name'}]"
       @listCreate="list"
       @listData="listData"
     >

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

@@ -169,7 +169,7 @@ export default {
           value: this.mainData.agentnum
         },
         {
-          label:'erp经销商编号',
+          label:'erp编号',
           value: this.mainData.erpagentnum
         },
         {

src/HManagement/notice/index.vue

@@ -57,7 +57,11 @@
     </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname === 'status'">
-          <span v-if="scope.data.column.data.isontop === 1" style="color:#FF3B30">置顶</span>
+          <span v-if="scope.data.column.data.isontop === 1" >
+            <span v-if="scope.data.column.data[scope.data.column.columnname] === '发布'" style="color:#52C41A">{{scope.data.column.data[scope.data.column.columnname]}}</span>
+            <span v-else>{{scope.data.column.data[scope.data.column.columnname]}}</span>
+            <span style="color:#FF3B30;margin-left: 10px">置顶</span>
+          </span>
           <div v-else>
             <span v-if="scope.data.column.data[scope.data.column.columnname] === '发布'" style="color:#52C41A">{{scope.data.column.data[scope.data.column.columnname]}}</span>
             <span v-else>{{scope.data.column.data[scope.data.column.columnname]}}</span>

src/HManagement/task/modules/completeTask.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-show="data.leader && data.leader[0] && nowUserid === data.leader[0].userid" :disabled="data.status !== '进行中' || data.status !== '待执行'" class="inline-16" type="primary" size="mini" @click="dialogFormVisible = true" >完成任务</el-button>
+    <el-button v-show="data.leader && data.leader[0] && nowUserid === data.leader[0].userid" :disabled="data.status == '已完成'" class="inline-16" type="primary" size="mini" @click="dialogFormVisible = true" >完成任务</el-button>
     <el-dialog title="完成任务" :visible.sync="dialogFormVisible" append-to-body width="500px">
       <el-form :model="form" label-position="top" label-width="90px">
         <el-form-item label="完成说明">

src/SDrpManagement/agentOrder/details/export_excel.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <el-button type="primary" size="small" @click="submit()" plain style="margin-bottom: 10px;margin-top: -10px">导 出</el-button>
+    <el-button type="primary" size="small" @click="submit()" plain >导 出</el-button>
   </div>
 </template>
 
 <script>
 export default {
-  props:['tablecols','param','excelTitle','total'],
+  props:['tablecols','param','excelTitle','total','specialKey'],
   data () {
     return {}
   },
@@ -14,26 +14,30 @@ export default {
     async submit () {
       let data = {}
       // 如果传入了total,需要赋值保证数量准确性
+      // data = Object.assign({},data,this.param)
+      data = JSON.parse(JSON.stringify(this.param))
       if (this.total) {
-        this.param.content.pageSize = this.total
+        data.content.pageSize = this.total
       }
-      data = JSON.parse(JSON.stringify(this.param))
+      data.content.isAll = false
 
-      data.content.isAll = true
       const res = await this.$api.requested(data)
-      console.log(res,"res111")
+
+      if (this.specialKey){
+        res.data.forEach(e=>{
+          this.specialKey.forEach(s=>{
+            e[s.key] = e[s.key]? e[s.key]:[]
+            e[s.key] = e[s.key].map(k=>{return s.value?k[s.value]:k}).toString()
+          })
+        })
+      }
+
       let table = JSON.parse(JSON.stringify(this.tablecols))
       table.forEach((e,index) => {
         // 由于表格数据结构问题这里需要判断一下
-       /* console.log(res)*/
-        console.log(index)
         if (e.title === '省市县') {
           table[index].title = '省'
           table.splice(index + 1,0,{title:'市',columnname:'city'},{title:'县',columnname:'county'})
-        }else if(e.title === '型号/规格'){
-          res.data.forEach(e => {
-            e.model = e.model + '/' + e.spec
-          })
         }else if(e.title === '需求日期'){
           res.data.forEach(e => {
             if (e.delivery === 0){
@@ -42,17 +46,9 @@ export default {
               e.needdate = e.needdate
             }
           })
-        }else if(e.title === '回复交期'){
-          res.data.forEach(e => {
-            if (e.delivery === 0){
-              e.deliverydate = '不管控交期'
-            }else {
-              e.deliverydate = e.deliverydate
-            }
-          })
-        }else if(e.title === '小计'){
+        }else if(e.title === '型号/规格'){
           res.data.forEach(e => {
-            e.totalprice = e.price * e.qty
+            e.model = e.model + '/' + e.spec
           })
         }
       });

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -1,12 +1,12 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
-<<<<<<< HEAD
-    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
-=======
+
+    <el-button class="inline-16" v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
+
     <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
-    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
->>>>>>> d8fdba3a2fd4ae678e15dee665c95eeaa4bd568b
+<!--    <el-button v-if="data.status === '新建'" style="margin:0 0 10px 0px" size="small" type="primary"  @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>-->
+
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -36,14 +36,16 @@
         width="180">
       </el-table-column>
       <el-table-column
-        label="型号/规格">
+        label="型号/规格"
+        prop="model">
         <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
         label="数量"
-        width="180">
+        width="180"
+        prop="qty">
         <template slot-scope="scope">
           <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
@@ -76,13 +78,15 @@
       </el-table-column>
       <el-table-column
         label="折后金额"
-        width="150">
+        width="150"
+        prop="amount">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.amount,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="需求日期"
+        prop="needdate"
         width="200">
         <template slot="header" slot-scope="scope">
           <div>

src/SDrpManagement/salerOrder/details/export_excel.vue

@@ -1,12 +1,12 @@
 <template>
   <div>
-    <el-button type="primary" size="small" @click="submit()" plain style="margin-bottom: 10px;margin-top: -10px">导 出</el-button>
+    <el-button type="primary" size="small" @click="submit()" plain >导 出</el-button>
   </div>
 </template>
 
 <script>
 export default {
-  props:['tablecols','param','excelTitle','total'],
+  props:['tablecols','param','excelTitle','total','specialKey'],
   data () {
     return {}
   },
@@ -14,45 +14,42 @@ export default {
     async submit () {
       let data = {}
       // 如果传入了total,需要赋值保证数量准确性
+      // data = Object.assign({},data,this.param)
+      data = JSON.parse(JSON.stringify(this.param))
       if (this.total) {
-        this.param.content.pageSize = this.total
+        data.content.pageSize = this.total
       }
-      data = JSON.parse(JSON.stringify(this.param))
+      data.content.isAll = false
 
-      data.content.isAll = true
       const res = await this.$api.requested(data)
-      console.log(res,"res111")
+
+      if (this.specialKey){
+        res.data.forEach(e=>{
+          this.specialKey.forEach(s=>{
+            e[s.key] = e[s.key]? e[s.key]:[]
+            e[s.key] = e[s.key].map(k=>{return s.value?k[s.value]:k}).toString()
+          })
+        })
+      }
+
       let table = JSON.parse(JSON.stringify(this.tablecols))
       table.forEach((e,index) => {
         // 由于表格数据结构问题这里需要判断一下
-       /* console.log(res)*/
-        console.log(index)
         if (e.title === '省市县') {
           table[index].title = '省'
           table.splice(index + 1,0,{title:'市',columnname:'city'},{title:'县',columnname:'county'})
-        }else if(e.title === '型号/规格'){
-          res.data.forEach(e => {
-            e.model = e.model + '/' + e.spec
-          })
         }else if(e.title === '需求日期'){
           res.data.forEach(e => {
-            if (e.delivery === 0){
+            console.log(e.delivery)
+            if (e.delivery == 0){
               e.needdate = '不管控交期'
             }else {
               e.needdate = e.needdate
             }
           })
-        }else if(e.title === '回复交期'){
-          res.data.forEach(e => {
-            if (e.delivery === 0){
-              e.deliverydate = '不管控交期'
-            }else {
-              e.deliverydate = e.deliverydate
-            }
-          })
-        }else if(e.title === '小计'){
+        }else if(e.title === '型号/规格'){
           res.data.forEach(e => {
-            e.totalprice = e.price * e.qty
+            e.model = e.model + '/' + e.spec
           })
         }
       });

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -1,12 +1,12 @@
 <template>
 <el-row :gutter="10">
   <el-col :span="setcol">
-<<<<<<< HEAD
-    <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
-=======
+
+    <el-button class="inline-16" style="margin:0 0 10px 0px" size="small" type="primary" @click="drawer = true">{{setcol === 24?'添 加':'取 消'}}</el-button>
+
     <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
-    <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>
->>>>>>> d8fdba3a2fd4ae678e15dee665c95eeaa4bd568b
+<!--    <el-button style="margin:0 0 10px 0px" size="small" type="primary" @click="setcol = setcol === 24?12:24">{{setcol === 24?'添 加':'取 消'}}</el-button>-->
+
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -36,14 +36,16 @@
         width="180">
       </el-table-column>
       <el-table-column
-        label="型号/规格">
+        label="型号/规格"
+        prop="model">
         <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
         label="数量"
-        width="180">
+        width="180"
+        prop="qty">
         <template slot-scope="scope">
           <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
@@ -51,6 +53,7 @@
       </el-table-column>
       <el-table-column
         label="需求日期"
+        prop="needdate"
         width="200">
         <template slot="header" slot-scope="scope">
           <div>
@@ -129,16 +132,17 @@
       </el-table-column>
       <el-table-column
         label="折后价格"
-        prop="totalprice">
+        prop="price">
         <template slot-scope="scope">
           <p>¥&nbsp;{{scope.row.price}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="折后金额"
-        width="150">
+        width="150"
+        prop="amount">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.amount,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column v-if="data.status === '新建'" width="90" fixed="right">

src/components/export_excel/index.vue

@@ -23,12 +23,15 @@ export default {
 
       const res = await this.$api.requested(data)
 
-      res.data.forEach(e=>{
-        this.specialKey.forEach(s=>{
-          e[s.key] = e[s.key]? e[s.key]:[]
-          e[s.key] = e[s.key].map(k=>{return s.value?k[s.value]:k}).toString()
+      if (this.specialKey){
+        res.data.forEach(e=>{
+          this.specialKey.forEach(s=>{
+            e[s.key] = e[s.key]? e[s.key]:[]
+            e[s.key] = e[s.key].map(k=>{return s.value?k[s.value]:k}).toString()
+          })
         })
-      })
+      }
+
       let table = JSON.parse(JSON.stringify(this.tablecols))
       table.forEach((e,index) => {
         // 由于表格数据结构问题这里需要判断一下

src/router/HManagement.js

@@ -460,7 +460,7 @@ const HManagement = [
     path: '/clue_import',
     name: 'orderclueupload',
     meta: {
-      title: '线索管理',
+      title: '线索导入',
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_import/index.vue'),
@@ -469,7 +469,7 @@ const HManagement = [
         path: '/importClueDetail',
         name: 'orderclueupload',
         meta: {
-          title: '线索管理',
+          title: '线索导入详情',
           ast_nav: true,
           keeproute: true
         },
@@ -500,7 +500,7 @@ const HManagement = [
     path: '/clue_private',
     name: 'orderclue_private',
     meta: {
-      title: '私域线索',
+      title: '线索管理',
       ast_nav: true
     },
     component: () => import(/* webpackChunkName: "about" */ '@/HManagement/clueManage/clue_private/index.vue'),

src/template/orderCanUseProduct/index.vue

@@ -44,17 +44,17 @@
         </template>
       </el-table-column>
       <el-table-column
-          label="标准"
+          label="材质"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.standards}}</span></p>
+          <p><span>{{scope.row.material || '--'}}</span></p>
         </template>
       </el-table-column>
       <el-table-column
-          label="材质"
+          label="标准"
           width="180">
         <template slot-scope="scope">
-          <p><span>{{scope.row.material || '--'}}</span></p>
+          <p><span>{{scope.row.standards || '--'}}</span></p>
         </template>
       </el-table-column>
       <el-table-column

vue.config.js

@@ -14,8 +14,8 @@ module.exports = {
       port: 8000,
       proxy: {
         '/apis': {
-          // target: 'http://61.164.207.46:8000',  // target host*/
-            target: 'http://122.226.136.204:8082/',  // target host
+          target: 'http://61.164.207.46:8000',  // target host*/
+            /*target: 'http://122.226.136.204:8082/',  // target host*/
           // target: 'localhost:8080',  // target host
           ws: true,  // proxy websockets 
           changeOrigin: true,  // needed for virtual hosted sites