Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -9,7 +9,7 @@
         <el-descriptions-item label="来源">{{mainData.cluesource}}</el-descriptions-item>
         <el-descriptions-item label="负责人">{{mainData.leadername}}</el-descriptions-item>
         <el-descriptions-item label="备注">{{mainData.notes}}</el-descriptions-item>
-        <el-descriptions-item label="所属经销商">{{mainData.agentname}}</el-descriptions-item>
+        <el-descriptions-item label="所属经销商">{{mainData.enterprisename}}</el-descriptions-item>
         <el-descriptions-item label="状态">
           <span v-if="mainData.status === '待分配'" style="color:#3874F6">{{mainData.status}}</span>
           <span v-if="mainData.status === '待跟进'" style="color:#FA8C16">{{mainData.status}}</span>

src/HManagement/clueManage/clue_public/modules/edit.vue

@@ -67,6 +67,7 @@ export default {
         this.data[e] !== '' ?this.data.value.push(this.data[e]):''
       })
       this.form = Object.assign({},this.form,this.data)
+      this.query_arealist()
     },
     async onSubmit () {
       
@@ -100,7 +101,7 @@ export default {
     }
   },
   mounted () {
-    this.query_arealist()
+    
   }
 }
 

src/HManagement/clueManage/clue_rule/modules/select_agent.vue

@@ -54,6 +54,7 @@ export default {
           }
         }
       },
+      search:{},
       selection:[],
       tablecols:[],
       list:[],

src/HManagement/clueManage/clue_rule/modules/select_saler.vue

@@ -54,6 +54,7 @@ export default {
           }
         }
       },
+      search:{},
       selection:[],
       tablecols:[],
       list:[],

src/HManagement/department/staff/list/modules/del.vue

@@ -17,7 +17,7 @@ export default {
         "classname": "webmanage.hr.hr",
         "method": "deleteHr",
         "content": {
-            "hrid":this.data.hrid
+          "hrid":this.data.hrid
         }
       }).then(res=>{
         if (res.code === 0) return this.$notify({title:'失败',type:'error',message:res.data})

src/HManagement/marketing/agent/modules/add_agent.vue

@@ -91,7 +91,7 @@ export default {
       
       form:{
         "value":[],
-        "sa_agentsid": 0,
+        "sys_enterpriseid": 0,
         "parentid":"",
         "agentnum":"",
         "agentname":"",

src/SDrpManagement/ProductGroup/index copy.vue

@@ -0,0 +1,199 @@
+<template>
+  <div class="group container normal-panel normal-margin">
+    <selectClass @brandChange="brandChange" @Search="Search" @clearSearch="clearSearch" :default="true"></selectClass>
+    <div class="content" v-if="Object.keys(productGroup).length > 0">
+      <div class="group-list">
+        <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
+          <div class="top">
+            <el-image :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="fill" />
+          </div>
+          <div class="bottom">
+            <p class="title">商品组名称：{{item.groupname}}</p>
+            <p class="descript">商品组编号：{{item.groupnum}}</p>
+            <p class="descript">所属营销分类：{{item.itemclassname}}</p>
+          </div>
+        </div>
+      </div>
+      <div class="page">
+        <pagination style="padding-bottom:0" :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"
+          @pageChange="pageChange">
+        </pagination>
+      </div>
+      
+    </div>
+    <el-empty description="暂无数据" v-else></el-empty>
+    
+  </div>
+</template>
+
+<script>
+import selectClass from './modules/Select'
+import Pagination from '@/components/pagination/Pagination'
+import { log } from '@antv/g2plot/lib/utils';
+export default {
+  name: '',
+  data() {
+    return {
+      brandList:'',
+      brandId:0,
+      tablecols:[],
+      productGroup:'',
+      params: {
+        "id": "20220926142203",
+        "version":1,
+        "content": {
+          "pageSize":20,
+          "pageNumber":1,
+          "nocache":true,
+          "brandids":[],
+          "where":{
+              "condition":""
+          }
+        }
+      },
+      total:0,
+    };
+  },
+  components:{selectClass,Pagination},
+  computed:{
+  },
+  watch:{
+  },
+  created() {
+    this.getbrandList()
+    this.tablecols = this.tool.tabelCol(this.$route.name).productGroupTable.tablecols
+  },
+  methods: {
+    /* 获取品牌数据 */
+    async getbrandList() {
+      let res = await this.$api.requested({
+        "id": "20220922085103",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "where":{
+              "condition":""
+          }
+        }
+      })
+      this.brandList = res.data.map(item => {
+        return {
+          label:item.brandname,
+          value:item.sa_brandid
+        }
+      })
+      this.brandId = this.brandList ? [this.brandList[0].value] : [0]
+      this.getProductGroup()
+      console.log(this.brandList,'品牌');
+    },
+    async getProductGroup() {
+      this.params.content.brandids = this.brandId
+      let res = await this.$api.requested(this.params)
+      this.productGroup = res.data
+      this.total = res.total
+      console.log(this.productGroup);
+    },
+    itemClick(id) {
+      this.$router.push({
+        path:'/groupDetail',
+        query: {
+          id:id.sa_itemgroupid,
+          brandid:id.sa_brandid
+        }
+      })
+    },
+    brandChange(id) {
+      this.brandId = id
+      this.getProductGroup()
+    },
+    pageChange(n) {
+      this.params.content.pageNumber = n
+      this.getProductGroup()
+    },
+    Search(data) {
+      this.params.content.where.condition = data
+      this.params.content.pageNumber = 1
+      this.getProductGroup()
+    },
+    clearSearch() {
+      this.params.content.where.condition = ''
+      this.params.content.pageNumber = 1
+      this.getProductGroup()
+    }
+  },
+};
+</script>
+
+<style scoped>
+*{
+  box-sizing: border-box;
+}
+.group .group-list {
+  display: flex;
+  flex-wrap: wrap;
+  margin-top: 16px;
+}
+.group .group-list .group-item {
+  width: 212px;
+  height: 250px;
+  background: #ffffff;
+  transition: all 0.1s ease-in;
+  margin: 0 16px 16px 0;
+  cursor: pointer;
+  border: 1px solid rgb(0,0,0,0.5);
+  overflow: hidden;
+}
+.group .group-list .group-item:hover {
+  border-color: red;
+}
+.group .group-list .group-item .el-image {
+  transition: transform 0.3s;
+}
+.group .group-list .group-item:hover .top .el-image {
+  transform: scale(1.3);
+}
+.group .group-list .group-item .top {
+  width: 212px;
+  height: 150px;
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+  overflow: hidden;
+  display: flex;
+  justify-content: space-around;
+}
+.group .group-list .group-item .bottom {
+  padding: 10px 18px 10px 16px;
+}
+.group .group-list .group-item .bottom .title {
+  font-size: 14px;
+  font-family: PingFang SC-Bold, PingFang SC;
+  font-weight: bold;
+  color: #333333;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 100%;
+  margin-bottom: 5px;
+}
+.group .group-list .group-item .bottom .descript {
+  font-size: 12px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #666666;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 100%;
+  margin-bottom: 4px;
+}
+.group .group-list .group-item .bottom .people {
+  font-size: 10px;
+  font-family: PingFang SC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+}
+.page {
+  display: flex;
+  flex-direction: row-reverse;
+}
+</style>

src/SDrpManagement/ProductGroup/index.vue

@@ -1,27 +1,36 @@
 <template>
-  <div class="group container normal-panel normal-margin">
+  <div class="group normal-margin">
     <selectClass @brandChange="brandChange" @Search="Search" @clearSearch="clearSearch" :default="true"></selectClass>
-    <div class="content" v-if="Object.keys(productGroup).length > 0">
-      <div class="group-list">
-        <div class="group-item" v-for="item in productGroup" :key="item.sa_itemgroupid" @click="itemClick(item)">
-          <div class="top">
-            <el-image :src="Object.keys(item.attinfos).length > 0 ? item.attinfos[0].url : ''" fit="fill" />
+     <div class="container" v-if="productGroup.length > 0">
+      <el-row style="height:calc(100vh - 300px);overflow-y:scroll" :gutter="20">
+        <el-col @click.native="itemClick(item)" :span="6" v-for="item in productGroup" :key="item.index">
+          <div class="product-card">
+            <div class="product-image">
+              <img style="width:100%" :src="item.attinfos[0]?item.attinfos[0].url:''" alt="">
+            </div>
+            <div class="product-info">
+              <p>{{item.groupname}}</p>
+              <p class="product-itemno">商品组编号：{{item.groupnum}}</p>
+              <p class="product-itemno">所属营销分类：{{item.itemclassname}}</p>
+              <!-- <div class="flex-align-center flex-between">
+                <p><span class="product-price">¥{{item.gradeprice}}</span>&nbsp;<span class="text-throughline">¥{{item.oldprice}}</span></p>
+                <div class="shopcart-btn">
+                  <i @click.stop="insertToShopCart(item)" style="font-size:1.5rem;color:#666" class="el-icon-shopping-cart-2"></i>
+                </div>
+              </div> -->
+            </div>
           </div>
-          <div class="bottom">
-            <p class="title">商品组名称：{{item.groupname}}</p>
-            <p class="descript">商品组编号：{{item.groupnum}}</p>
-            <p class="descript">所属营销分类：{{item.itemclassname}}</p>
-          </div>
-        </div>
-      </div>
-      <div class="page">
+        </el-col>
+      </el-row>
+      <div style="text-align:center">
         <pagination style="padding-bottom:0" :total="total" :pageSize="params.content.pageSize" :currentPage="params.content.pageNumber"
           @pageChange="pageChange">
         </pagination>
       </div>
-      
     </div>
-    <el-empty description="暂无数据" v-else></el-empty>
+    <div style="height:calc(100vh - 300px)" class="flex-align-center flex-around" v-else>
+      <el-empty :image="emptyUrl" description="暂无商品"></el-empty>
+    </div>
     
   </div>
 </template>
@@ -52,6 +61,8 @@ export default {
         }
       },
       total:0,
+      currentPage:0,
+      emptyUrl:require('../../assets/Empty.png'),
     };
   },
   components:{selectClass,Pagination},
@@ -91,7 +102,7 @@ export default {
       let res = await this.$api.requested(this.params)
       this.productGroup = res.data
       this.total = res.total
-      console.log(this.productGroup);
+      this.currentPage = res.pageNumber
     },
     itemClick(id) {
       this.$router.push({
@@ -125,75 +136,43 @@ export default {
 </script>
 
 <style scoped>
-*{
-  box-sizing: border-box;
+.product-card{
+  padding: 10px;
+  margin-bottom: 20px;
+  background: #fff;
+  transition: all .2s linear;
+  cursor: pointer;
 }
-.group .group-list {
+.product-image{
   display: flex;
-  flex-wrap: wrap;
-  margin-top: 16px;
-}
-.group .group-list .group-item {
-  width: 212px;
-  height: 250px;
-  background: #ffffff;
-  transition: all 0.1s ease-in;
-  margin: 0 16px 16px 0;
-  cursor: pointer;
-  border: 1px solid rgb(0,0,0,0.5);
+  align-items: center;
+  height: 150px;
   overflow: hidden;
 }
-.group .group-list .group-item:hover {
-  border-color: red;
+.product-info{
+  padding:10px
 }
-.group .group-list .group-item .el-image {
-  transition: transform 0.3s;
+.product-card:hover{
+  box-shadow: 0 15px 30px rgb(0 0 0 / 10%);
+  transform: translate3d(0,-2px,0);
 }
-.group .group-list .group-item:hover .top .el-image {
-  transform: scale(1.3);
+.product-price {
+  color: red;
 }
-.group .group-list .group-item .top {
-  width: 212px;
-  height: 150px;
-  border-top-right-radius: 4px;
-  border-top-left-radius: 4px;
-  overflow: hidden;
-  display: flex;
-  justify-content: space-around;
-}
-.group .group-list .group-item .bottom {
-  padding: 10px 18px 10px 16px;
+.product-itemno{
+  font-size: 12px;
+  color:#888;
+  margin: 10px 0;
 }
-.group .group-list .group-item .bottom .title {
+.text-throughline{
   font-size: 14px;
-  font-family: PingFang SC-Bold, PingFang SC;
-  font-weight: bold;
-  color: #333333;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  width: 100%;
-  margin-bottom: 5px;
+  text-decoration: line-through;
+  color:#999
 }
-.group .group-list .group-item .bottom .descript {
-  font-size: 12px;
-  font-family: PingFang SC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #666666;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  width: 100%;
-  margin-bottom: 4px;
+.shopcart-btn{
+  height:40px;width:40px;text-align:right;line-height:45px
 }
-.group .group-list .group-item .bottom .people {
-  font-size: 10px;
-  font-family: PingFang SC-Regular, PingFang SC;
-  font-weight: 400;
-  color: #999999;
-}
-.page {
-  display: flex;
-  flex-direction: row-reverse;
+.shopcart-btn:hover i{
+  color:#4F7BFD !important;
 }
 </style>

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail copy.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="detail normal-panel" v-if="selectProduct">
+    <div class="left">
+      <el-image :src="selectProduct.attinfos[0].url" fit="fill"></el-image>
+    </div>
+    <div class="right container">
+      <div class="header">
+        <p class="title">{{selectProduct.itemname}}</p>
+        <p class="code"><span class="small">编号:</span>{{selectProduct.itemno}}</p>
+        <div class="price">
+          <span class="small">价格:</span>
+          <div class="number">
+            <span class="new">￥<span style="font-size:24px">{{this.selectProduct.gradeprice}}</span></span>
+            <span class="small"><span
+                class="old">￥{{selectProduct.oldprice}}</span>{{`(/${this.selectProduct.unitname})`}}</span>
+          </div>
+        </div>
+      </div>
+      <div class="count-box">
+        <span class="small">数量：</span>
+        <div class="count-handle">
+          <el-input-number size="small" v-model="count" @change="countChange" :min="1"></el-input-number>
+        </div>
+      </div>
+      <div class="type">
+        <span class="small">型号</span>
+        <div class="content">
+          <el-tag @click="typeClick(item)" v-for="(item,index) in detail" :key="index"
+            :style="selectProduct.itemno == item.itemno ? 'background:#2b3e68;color:#ffffff' : ''">{{item.model}}
+          </el-tag>
+        </div>
+      </div>
+      <div class="shopping">
+        <el-button size="small" type="primary" icon="el-icon-shopping-cart-1" @click="addCart">加入购物车</el-button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils';
+export default {
+  name: '',
+  data () {
+    return {
+      detail: '',
+      count: 1,
+      selectProduct: ''
+    };
+  },
+  computed: {
+  },
+  watch: {
+  },
+  created () {
+    this.getDetail()
+  },
+  methods: {
+    async getDetail () {
+      let res = await this.$api.requested({
+        "id": "20220926142403",
+        "version": 1,
+        "content": {
+          "sa_itemgroupid": this.$route.query.id
+        }
+      })
+      this.detail = res.data
+      this.selectProduct = this.detail ? this.detail[0] : ''
+      console.log(this.selectProduct);
+
+    },
+    countChange (num) {
+      this.count = num
+      console.log(this.count, '数量');
+    },
+    typeClick (data) {
+      console.log(data);
+      this.selectProduct = data
+      this.count = 1
+    },
+    
+    async addCart () {
+      let res = await this.$api.requested({
+        "id": 20220924095102,
+        "content": {
+          "sa_brandid": this.$route.query.brandid, //品牌id
+          "itemid": this.selectProduct.itemid, //货品id
+          "qty": this.count, //数量
+          "itemno": this.selectProduct.itemno //货品编号
+        },
+      })
+      console.log(res);
+
+      if (res.code == 1) {
+        this.$message({
+          message: '加入购物车成功',
+          type: 'success'
+        })
+      }
+    }
+  },
+};
+</script>
+
+<style scoped>
+* {
+  box-sizing: border-box;
+}
+.detail {
+  height: calc(100vh - 100px);
+  display: flex;
+  padding: 10px 10px 0 10px;
+}
+.detail .left {
+  flex: 1.5;
+  height: 100%;
+  border: 1px solid rgba(0, 0, 0, 0.05);
+}
+.detail .right {
+  flex: 3;
+  height: 100%;
+}
+.detail .right .header {
+  padding-bottom: 12px;
+  border-bottom: 1px solid #cccccc;
+}
+.detail .right .header .title {
+  font-size: 20px;
+  font-weight: 700;
+}
+.detail .right .header .code {
+  color: #0250a3;
+  height: 50px;
+  line-height: 50px;
+}
+.detail .right .header .price {
+  display: flex;
+  height: 50px;
+  line-height: 50px;
+}
+.detail .right .header .price .number {
+}
+.detail .right .header .price .number .new {
+  color: #dc3545;
+  font-size: 12px;
+  margin-right: 12px;
+}
+.detail .right .header .price .number .old {
+  text-decoration: line-through;
+}
+
+.detail .right .count-box {
+  display: flex;
+  align-items: center;
+  height: 80px;
+  border-bottom: 1px solid #cccccc;
+  padding: 12px 0;
+  margin-bottom: 10px;
+}
+
+.detail .right .type {
+  display: flex;
+}
+.detail .right .type .content {
+  display: flex;
+  flex-wrap: wrap;
+  min-height: 100px;
+  max-height: 300px;
+  overflow-y: scroll;
+  width: 100%;
+}
+.detail .right .type .content .el-tag {
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+}
+.detail .right .shopping {
+  padding-left: 100px;
+}
+
+.small {
+  font-size: 12px;
+  color: #a7a7a9;
+  width: 100px;
+}
+</style>

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -1,40 +1,42 @@
 <template>
-  <div class="detail normal-panel" v-if="selectProduct">
-    <div class="left">
-      <el-image :src="selectProduct.attinfos[0].url" fit="fill"></el-image>
-    </div>
-    <div class="right container">
-      <div class="header">
-        <p class="title">{{selectProduct.itemname}}</p>
-        <p class="code"><span class="small">编号:</span>{{selectProduct.itemno}}</p>
-        <div class="price">
-          <span class="small">价格:</span>
-          <div class="number">
-            <span class="new">￥<span style="font-size:24px">{{this.selectProduct.gradeprice}}</span></span>
-            <span class="small"><span
-                class="old">￥{{selectProduct.oldprice}}</span>{{`(/${this.selectProduct.unitname})`}}</span>
+<div class="container normal-panel">
+  <div class="product-detail container">
+    <el-row :gutter="20">
+      <el-col :span="7">
+        <img style="width:100%" :src="selectProduct.attinfos?selectProduct.attinfos[0].url:''">
+      </el-col>
+      <el-col :span="17">
+        <div>
+          <p class="productName normal-margin">{{selectProduct.itemname}}</p>
+          <p class="normal-margin" style="color:#888;">编码:&emsp;{{selectProduct.itemno}}</p>
+          <p class="normal-margin">价格:&emsp;<span class="product-price">¥{{selectProduct.gradeprice}}</span>&nbsp;<span class="text-throughline">¥{{selectProduct.gradeprice}}</span></p>
+          <div class="line normal-margin"></div>
+          <div>
+            <p class="normal-margin">规格:{{selectProduct.spec}}</p>
+          </div>
+          <div class="flex-align-center" style="margin-bottom:30px">
+            <p>数量:&emsp;</p>
+            <el-input-number v-model="count" :min="selectProduct.orderminqty" :step="selectProduct.orderaddqty" label="描述文字"></el-input-number>
+          </div>
+          <p class="normal-margin">型号:&emsp;{{selectProduct.model}}</p>
+          <div class="type">
+            <span class="small">型号</span>
+            <div class="content">
+              <el-tag @click="typeClick(item)" v-for="(item,index) in detail" :key="index"
+                :style="selectProduct.itemno == item.itemno ? 'background:#2b3e68;color:#ffffff' : ''">{{item.model}}
+              </el-tag>
+            </div>
+          </div>
+          <!-- <p class="normal-margin">材质:&emsp;{{selectProduct.model}}</p> -->
+          <el-button class="normal-margin" type="primary" style="width:200px" @click="addCart">加入购物车</el-button>
+          <div>
+            <p>相关链接</p>
           </div>
         </div>
-      </div>
-      <div class="count-box">
-        <span class="small">数量：</span>
-        <div class="count-handle">
-          <el-input-number size="small" v-model="count" @change="countChange" :min="1"></el-input-number>
-        </div>
-      </div>
-      <div class="type">
-        <span class="small">型号</span>
-        <div class="content">
-          <el-tag @click="typeClick(item)" v-for="(item,index) in detail" :key="index"
-            :style="selectProduct.itemno == item.itemno ? 'background:#2b3e68;color:#ffffff' : ''">{{item.model}}
-          </el-tag>
-        </div>
-      </div>
-      <div class="shopping">
-        <el-button size="small" type="primary" icon="el-icon-shopping-cart-1" @click="addCart">加入购物车</el-button>
-      </div>
-    </div>
+      </el-col>
+    </el-row>
   </div>
+</div>
 </template>
 
 <script>
@@ -103,83 +105,71 @@ export default {
 </script>
 
 <style scoped>
-* {
-  box-sizing: border-box;
-}
-.detail {
-  height: calc(100vh - 100px);
-  display: flex;
-  padding: 10px 10px 0 10px;
-}
-.detail .left {
-  flex: 1.5;
-  height: 100%;
-  border: 1px solid rgba(0, 0, 0, 0.05);
+.product-detail{
+  background: #fff;
+  width: 80%;
+  margin:30px 0;
+  border-radius: 10px;
 }
-.detail .right {
-  flex: 3;
-  height: 100%;
+.product-detail p{
+  font-size: 14px;
+  color:#888 ;
 }
-.detail .right .header {
-  padding-bottom: 12px;
-  border-bottom: 1px solid #cccccc;
+.productName{
+  font-size: 1.75rem !important;
+  color: #333 !important;
 }
-.detail .right .header .title {
-  font-size: 20px;
-  font-weight: 700;
+.line{
+  border-bottom: 1px dashed #e3e5ea;
 }
-.detail .right .header .code {
-  color: #0250a3;
-  height: 50px;
-  line-height: 50px;
+.border-left {
+  border-left:1px solid #e3e5ea
 }
-.detail .right .header .price {
-  display: flex;
-  height: 50px;
-  line-height: 50px;
+.product-price {
+  font-size: 1.25rem !important;
+  color: red;
 }
-.detail .right .header .price .number {
-}
-.detail .right .header .price .number .new {
-  color: #dc3545;
+.product-itemno{
   font-size: 12px;
-  margin-right: 12px;
+  color:#888;
+  margin-bottom: 20px;
 }
-.detail .right .header .price .number .old {
+.text-throughline{
+  font-size: 14px;
   text-decoration: line-through;
+  color:#999
+}.product-detail{
+  background: #fff;
+  width: 80%;
+  margin:30px 0;
+  border-radius: 10px;
 }
-
-.detail .right .count-box {
-  display: flex;
-  align-items: center;
-  height: 80px;
-  border-bottom: 1px solid #cccccc;
-  padding: 12px 0;
-  margin-bottom: 10px;
+.product-detail p{
+  font-size: 14px;
+  color:#888 ;
 }
-
-.detail .right .type {
-  display: flex;
+.productName{
+  font-size: 1.75rem !important;
+  color: #333 !important;
 }
-.detail .right .type .content {
-  display: flex;
-  flex-wrap: wrap;
-  min-height: 100px;
-  max-height: 300px;
-  overflow-y: scroll;
-  width: 100%;
+.line{
+  border-bottom: 1px dashed #e3e5ea;
 }
-.detail .right .type .content .el-tag {
-  margin: 0 10px 10px 0;
-  cursor: pointer;
+.border-left {
+  border-left:1px solid #e3e5ea
 }
-.detail .right .shopping {
-  padding-left: 100px;
+.product-price {
+  font-size: 1.25rem !important;
+  color: red;
 }
-
-.small {
+.product-itemno{
   font-size: 12px;
-  color: #a7a7a9;
-  width: 100px;
+  color:#888;
+  margin-bottom: 20px;
+}
+.text-throughline{
+  font-size: 14px;
+  text-decoration: line-through;
+  color:#999
 }
 </style>

src/SDrpManagement/shopCart/modules/total.vue

@@ -27,7 +27,7 @@ export default {
       });
     },
     async deleSelectProd ()  {
-      const res = this.$api.requested({
+      const res = await this.$api.requested({
         "id": 20220924095202,
         "content": {
           "sa_shoppingcartids": this.data.map(e=>{return e.sa_shoppingcartid})

src/SManagement/orderclue/components/add.vue

@@ -15,6 +15,7 @@
         </el-form-item>
         <el-form-item label="省市县" prop="province">
           <el-cascader
+            size="small"
             class="width-240"
             v-model="param.content.province"
             :options="_arealist"

src/SManagement/orderclue/components/edit.vue

@@ -21,6 +21,7 @@
         </el-form-item>
         <el-form-item label="省市县" prop="province">
           <el-cascader
+            size="small"
             class="width-240"
             v-model="param.content.province"
             :options="arealist"

src/SManagement/orderclue/components/move.vue

@@ -5,8 +5,8 @@
     <el-dialog title="转移" :visible.sync="dialogVisible" width="500px" :before-close="handleClose">
       <div class="handle">
         <p class="title">团队成员</p>
-        <el-select placeholder="请选择转移人" v-model="param.content.sa_agent_hrid" size="small">
-          <el-option v-for="(item,index) in teamList" :key="index" :label="item.name" :value="item.sa_agent_hrid">{{item.name}}</el-option>
+        <el-select placeholder="请选择转移人" v-model="param.content.sys_enterprise_hrid" size="small">
+          <el-option v-for="(item,index) in teamList" :key="index" :label="item.name" :value="item.sys_enterprise_hrid">{{item.name}}</el-option>
         </el-select>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -28,7 +28,7 @@ export default {
         "method": "changeClue",
         "content": {
           "sat_orderclueid": [],
-          "sa_agent_hrid": ''
+          "sys_enterprise_hrid": ''
         }
       },
     };
@@ -64,7 +64,7 @@ export default {
       this.tool.showMessage(res,() => {
         this.dialogVisible = false
         this.$emit('updataList')
-        this.param.content.sa_agent_hrid = ''
+        this.param.content.sys_enterprise_hrid = ''
       })
     }
   }

src/SManagement/orderclue/index.vue

@@ -92,7 +92,6 @@ export default {
         "content": {
         }
       })
-      console.log(res.data);
       
       this.arealist = this.tool.createMenu(res.data)
     },

src/SManagement/user/team-manage/components/AddUser.vue

@@ -140,7 +140,7 @@ export default {
         "classname": "sale.team.team",
         "method": "queryRole",
         "content": {
-          "sa_agent_hrid": 0
+          "sys_enterprise_hrid": 0
         }
       })
       this.checkList = res.data

src/SManagement/user/team-manage/components/RemoveTeam.vue

@@ -30,7 +30,7 @@ export default {
         "classname": "sale.team.team",
         "method": "deleteHr",
         "content": {
-            "sys_enterprise_hrid": this.teamData.sys_enterprise_hrid
+          "sys_enterprise_hrid": this.teamData.sys_enterprise_hrid
         }
       })
       this.tool.showMessage(res,() => {