Merge branch 'mergeBranch' into greenUrgent

src/Form/publicCustomer/add.vue

@@ -149,8 +149,8 @@
             <el-col :span="24">
               <el-form-item label="联系人:"  prop="contactsinfo.name">
                 <el-popover
-                    placement="bottom-start"
-                    width="900"
+                    placement="left-start"
+                    width="600"
                     v-model="enterpriseContact.show"
                     trigger="click">
                   <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">

src/Form/salerPrivatecustomer/add.vue

@@ -148,8 +148,8 @@
             <el-col :span="24">
               <el-form-item label="联系人:"  prop="contactsinfo.name">
                 <el-popover
-                    placement="bottom-start"
-                    width="900"
+                    placement="left-start"
+                    width="600"
                     v-model="enterpriseContact.show"
                     trigger="click">
                   <el-tabs type="border-card" @tab-click="changeTab" v-model="activeName">

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -74,6 +74,7 @@ export default {
       form: {
         sa_brandid: '',
         groupname: '',
+        itemid:'0',
         itemno: '',
         itemname:'',
         sequence:'1',
@@ -111,6 +112,7 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemid:'0',
         itemname:'',
         tag: []
       },
@@ -159,6 +161,7 @@ export default {
     },
     productChange (data) {
       this.form.itemno = data.itemno
+      this.form.itemid = data.itemid
       this.form.itemname = data.itemname
       this.$refs.product.visible = false
     },
@@ -170,6 +173,7 @@ export default {
           "sa_brandid":this.groupdata.sa_brandid,
           "groupname":this.groupdata.groupname,
           "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
           "tag": []
         }
       })

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -55,6 +55,7 @@ export default {
       brandList:[],
       form: {
         sa_brandid: '',
+        itemid:'',
         groupname: '',
         itemno: '',
         tag: [],
@@ -96,6 +97,7 @@ export default {
     },
     productChange (data) {
       this.form.itemno = data.itemno
+      this.form.itemid = data.itemid
       this.form.itemname = data.itemname
       this.$refs.product.visible = false
     },
@@ -133,12 +135,13 @@ export default {
           "sa_brandid":this.groupdata.sa_brandid,
           "groupname":this.groupdata.groupname,
           "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
           "tag": []
         }
       })
       this.$emit('onSuccess')
       this.drawer = false
-      
+
     }
   }
 }
@@ -159,4 +162,4 @@ export default {
   text-align: center;
   margin-top: 10px;
 }
-</style>
+</style>

src/HDrpManagement/ProductGroupMag/modules/editHeader.vue

@@ -49,7 +49,8 @@ export default {
         groupname: '',
         itemno: '',
         tag: [],
-        sequence:''
+        sequence:'',
+        itemid:''
       },
       rules: {
         sa_brandid: [
@@ -78,6 +79,7 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemid:'',
         tag: []
       },
       this.tableData = []
@@ -93,7 +95,7 @@ export default {
       })
     },
     async submit() {
-      if (this.tableData.length === 0) 
+      if (this.tableData.length === 0)
       const res = await this.$api.requested({
         "id": "20220922164303",
         "content": {
@@ -101,6 +103,7 @@ export default {
           "sa_brandid":this.form.sa_brandid,
           "groupname":this.form.groupname,
           "itemno":"",
+          "itemid":"",
           "sequence":this.form.sequence,
           "tag": []
         }
@@ -119,7 +122,6 @@ export default {
         }
       })
       this.brandList = res.data
-      console.log(this.brandList,'品牌');
     },
     async onSuccess () {
       const res = await this.$api.requested({
@@ -129,12 +131,13 @@ export default {
           "sa_brandid":this.groupdata.sa_brandid,
           "groupname":this.groupdata.groupname,
           "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
           "tag": []
         }
       })
       this.$emit('onSuccess')
       this.drawer = false
-      
+
     }
   }
 }
@@ -155,4 +158,4 @@ export default {
   text-align: center;
   margin-top: 10px;
 }
-</style>
+</style>

src/HManagement/marketing2/saler/area/modules/areaListNew.vue

@@ -5,23 +5,28 @@
         width="400"
         trigger="click"
         v-model="visible">
-      <el-tree
-          :data="areaList"
-          node-key="id"
-          default-expand-all
-          highlight-current
-          :expand-on-click-node="false"
-          @node-click="nodeClick"
-      >
+      <div style="overflow: auto;max-height: 550px">
+        <el-tree
+            :data="areaList"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            :expand-on-click-node="false"
+            @node-click="nodeClick"
+        >
                   <span class="custom-tree-node" slot-scope="{ node, data }">
                     <span>{{ node.label }}</span>
                     <span>
 <!--                      <el-button size="small" type="text" @click="selectArea(data,visible=false)" v-if="data.areaname === pointValue" style="color: #FFFFFF">选 择</el-button>-->
-                      <el-button size="small" type="text" @click="selectArea(data,visible=false)" >选 择</el-button>
+<!--                      <el-button size="small" type="text" @click="selectArea(data,visible=false)" >选 择</el-button>-->
+                       <el-button size="small" type="text" @click="selectArea(data,visible=false)" v-if="data.sa_saleareaid === pointValue" style="color: #FFFFFF">选 择</el-button>
+                        <el-button size="small" type="text" @click="selectArea(data,visible=false)" v-else >选 择</el-button>
                     </span>
                   </span>
-      </el-tree>
-            <el-input slot="reference" v-model="areaname" readonly placeholder="请选择" autocomplete="off" @focus="onClick"></el-input>
+        </el-tree>
+
+      </div>
+      <el-input slot="reference" v-model="areaname" readonly placeholder="请选择" autocomplete="off" @focus="onClick"></el-input>
     </el-popover>
   </div>
 </template>
@@ -44,12 +49,10 @@ export default {
   },
   methods:{
     onClick(){
-      console.log('点击')
       this.listData()
     },
     async listData(){
       const res = await this.$api.requested(this.param)
-      console.log(res.data,'区域列表')
       this.areaList = this.createMenu(res.data)
       this.$emit('areaList',res.data)
     },
@@ -79,10 +82,9 @@ export default {
       return arr
     },
     nodeClick(val){
-      this.pointValue = val.areaname
+      this.pointValue = val.sa_saleareaid
     },
     selectArea(data){
-      console.log(data,'选择区域')
       this.$emit('selectArea',data)
     }
   },

src/SDrpManagement/QuotedPrice/detail/modules/detailed/index.vue

@@ -17,7 +17,7 @@
         <el-descriptions-item label="电话">{{ basic.telephone?basic.telephone:"--" }}</el-descriptions-item>
         <el-descriptions-item label="联系人">{{ basic.contactsname?basic.contactsname:"--" }}</el-descriptions-item>
         <el-descriptions-item label="手机号">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
-        <el-descriptions-item label="报价日期">{{ basic.contactsphonenumber?basic.contactsphonenumber:"--" }}</el-descriptions-item>
+        <el-descriptions-item label="报价日期">{{ basic.billdate?basic.billdate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="有效期">{{ basic.begdate?basic.begdate + '至' + basic.enddate:"--" }}</el-descriptions-item>
         <el-descriptions-item label="折扣(%)">{{ basic.discountrate !== 0?Math.round((basic.discountrate * 100)*100)/100:"--" }}</el-descriptions-item>
         <el-descriptions-item label="总金额(元)">{{ totalPrice?totalPrice:"--" }}</el-descriptions-item>