2023-3-21

src/App.vue

@@ -42,7 +42,7 @@
 <style>
 body{
   font:16px/1.5 Helvetica Neue,Helvetica,Arial,Microsoft Yahei,Hiragino Sans GB,Heiti SC,WenQuanYi Micro Hei,sans-serif;
-  font-family: "阿里巴巴普惠体 2.0 35 Thin";
+  font-family: "微软雅黑";
   min-width: 1200px;
 }
 .rightBar{

src/Form/marketing2/agent/add.vue

@@ -143,8 +143,6 @@
 <script>
 import enterprise from '@/template/enterprise/index.vue'
 import selectAgent from '@/components/selectAgent/index.vue'
-
-selectAgent
 export default {
   data () {
     return {

src/HDrpManagement/ProductMag/detail/index.vue

@@ -9,7 +9,7 @@
         idname="itemid"
         ownertable="plm_item"
         tags=""
-        :tabs="['详细信息','营销分类','商品等级价格']"
+        :tabs="['详细信息','营销分类','商品组','商品等级价格']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)"
         >
@@ -73,7 +73,11 @@
         </saleClass>
       </div>
       <div slot="slot2">
-        <productPrice ></productPrice>
+        <productGroup ref="productGroup" :data="mainData">
+        </productGroup>
+      </div>
+      <div slot="slot3">
+        <productPrice></productPrice>
       </div>
     </basicDetails>
   </div>
@@ -83,6 +87,7 @@
 import Edit from '../modules/edit'
 import detail_data from './modules/detailedData'
 import saleClass from '../modules/saleClass.vue'
+import productGroup from '../modules/productGroup.vue'
 import productPrice from '../modules/productPrice'
 import addClass from '../modules/addClass'
 export default {
@@ -93,7 +98,7 @@ export default {
       mainAreaData:{}
     }
   },
-  components:{detail_data,saleClass,productPrice,addClass,Edit},
+  components:{detail_data,saleClass,productPrice,addClass,Edit,productGroup},
   methods: {
     async queryMainData(id) {
       const res = await this.$api.requested({

src/HDrpManagement/ProductMag/modules/productGroup.vue

@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <el-table
+      :data="list"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="groupnum"
+        label="商品组号">
+      </el-table-column>
+      <el-table-column
+        prop="groupname"
+        label="商品组名称">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "productPrice",
+  data(){
+    return {
+      tablecols:[],
+      list:[],
+      param:{
+      "id": 20221216102302,
+      "content": {
+          "pageNumber": 1,
+          "pageSize": 99999999,
+          "itemid": '',
+          "where": {
+              "condition": ""
+          }
+        }
+      }
+    }
+  },
+  methods:{
+    async listData(){
+      this.param.content.itemid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.list = res.data
+    }
+  },
+  mounted() {
+    this.listData()
+  },
+  created() {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['commodityPriceGradeTable'].tablecols
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/ProductMag/modules/saleClass copy.vue

@@ -1,172 +0,0 @@
-<template>
-  <div>
-    <!-- <el-button size="small" type="primary" @click="dialogTableVisible = true">设置营销分类</el-button> -->
-<!--    <el-dropdown-item @click.native="onShow()">设置营销分类</el-dropdown-item>-->
-    <ul class="flex-align-center">
-      <li class="brand-item" :class="activeid === item.value?'act':''" v-for="item in classList" :key="item.index" @click="brandClick(item)">{{item.label}}</li>
-    </ul>
-    <div>
-      <tree :data="activeBrandData" node-key="itemclassid" :check-strictly="false"></tree>
-    </div>
-    <el-button type="primary" size="small" @click="onSubmit">保存</el-button>
-  </div>
-</template>
-
-<script>
-import tree from './components/classTree.vue'
-import {mapGetters} from 'vuex'
-export default {
-  props:['data'],
-  data () {
-    return {
-      dialogTableVisible:false,
-      classList:[],
-      activeBrandData:[],
-      haveBindClass:[],
-      activeid:0
-    }
-  },
-  components:{
-    tree
-  },
-  computed:{
-    ...mapGetters({
-      checks:'checks'
-    })
-  },
-  methods:{
-    onShow () {
-      this.saleClass(()=>{
-        this.dialogTableVisible = true
-        this.bindSaleClass()
-      })
-    },
-    async saleClass (fn) {
-      const res = await this.$api.requested({
-          "id": "20220922110403",
-          "version":1,
-          "content": {
-            "sa_brandid":0
-          }
-      })
-      console.log(res.data);
-      
-      let arr = res.data.map(e=>{
-        return {
-          itemclassname:e.brandname,
-          itemclassid:e.sa_brandid,
-          subdep:e.ttemclass
-        }
-      })
-      this.classList = this.createMenu(arr)
-      this.activeid = this.classList[0].value
-      this.activeBrandData = this.classList[0].children
-      fn()
-    },
-    createMenu (array) {
-      let arr = []
-      function convertToElementTree(node) {
-        // 新节点
-        var elNode = {
-          label:node['itemclassname'],
-          value:node['itemclassid'],
-          itemclassnum:node['itemclassnum'],
-          itemclassid:node['itemclassid'],
-          hasChild:true,
-          checked:false
-        }
-        if (node.subdep && node.subdep.length > 0) {
-          // 如果存在子节点
-          elNode.children = []
-          for (var index = 0; index < node.subdep.length; index++) {
-          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
-            elNode.children.push(convertToElementTree(node.subdep[index]));
-          }
-        } else {
-          elNode.hasChild = false
-        }
-        return elNode;
-      }
-      array.forEach((element) => {
-        arr.push(convertToElementTree(element))
-      });
-      return arr
-    },
-    //点击品牌
-    brandClick (item) {
-      this.activeid = item.value
-      this.activeBrandData = item.children
-    },
-
-    // 提交授权数据
-    async onSubmit () {
-      const res = await this.$api.requested({
-        "id": 20220927090102,
-        "content": {
-          "itemclassids":this.checks,
-          "itemid": this.data.itemid,
-          "itemno":this.data.itemno
-        }
-      })
-      this.tool.showMessage(res,()=>{
-        this.dialogTableVisible = false
-      })
-    },
-
-    // 查询已绑定分类
-    async bindSaleClass () {
-      var that = this
-      const res = await this.$api.requested({
-        "id": 20220927090202,
-        "content": {
-            "itemid": this.data.itemid,
-            "itemno":this.data.itemno
-        }
-      })
-
-      this.haveBindClass = res.data
-      // 设置已绑定的id,用于check显示
-      res.data.filter(e=>{
-        this.$store.dispatch('checkClass',e.itemclassid)
-      })
-      // 递归,遍历数组设置勾选状态
-      function convertToElementTree(node) {
-        that.haveBindClass.forEach(e=>{
-          if (e.itemclassid === node.value) {
-            node.checked = true
-          }
-        })
-        if (node.children && node.children.length > 0) {
-          for (var index = 0; index < node.children.length; index++) {
-            convertToElementTree(node.children[index])
-          }
-        }
-      }
-
-      this.classList.forEach((element) => {
-        convertToElementTree(element)
-      });
-    }
-  },
-  mounted () {
-    this.onShow()
-  }
-}
-
-</script>
-<style>
-</style>
-<style scoped>
-.brand-item{
-  padding-left:40px ;
-  margin-right:20px;
-  margin-bottom: 15px;
-  text-align: center;
-  font-size: 16px;
-  font-weight: 600;
-  cursor: pointer;
-}
-.act{
-  color: #3874f6;
-}
-</style>

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData" class="inline-16"></addorderline>
+    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')" class="inline-16"></addorderline>
     <el-input  style="width:200px;" placeholder="搜索" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
     </el-input>
     <el-table :data="list" size="mini" border>
@@ -92,6 +92,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.listData()
+        this.$emit('onSuccess')
       })
     } 
   },

src/HDrpManagement/orderManage/details/index.vue

@@ -171,7 +171,7 @@ export default {
           }
         })
         this.mainData = res.data
-        
+        console.log(this.mainData);
         this.changeDataStructure()
         this.orderreviewtype()
         re()

src/HDrpManagement/orderManage/modules/edit.vue

@@ -117,73 +117,136 @@
         <div style="flex:1;">
           <div class="mt-10">
             <p class="normal-title inline-16">收货信息</p>
-            <el-popover
-              placement="bottom"
-              title="选择地址"
-              trigger="click"
-              v-model="visible">
-              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
-                <el-input 
-                  size="small"  
-                  v-model="addressparam.content.where.condition" 
-                  placeholder="请输入搜索内容" 
-                  style="width:150px"
-                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
-                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
-              </div>
-              <el-table
-                :data="receiveAddresslist"
-                style="width: 100%"
-                size="mini">
-                <el-table-column
-                  prop="name"
-                  label="联系人"
-                  width="90">
-                </el-table-column>
-                <el-table-column
-                  prop="phonenumber"
-                  label="电话"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  label="地址"
-                  width="360">
-                  <template slot-scope="scope">
-                    {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="操作"
-                  width="120">
-                  <template slot-scope="scope">
-                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
-                    <delete-btn 
-                      message="确定删除当前地址吗?"
-                      nameId="20221009155903" 
-                      nameKey="contactsid" 
-                      :id="scope.row.contactsid"
-                      :isNumber="true"
-                      @deleteSuccess="receiveAddress"
-                    ></delete-btn>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <div class="container" v-if="addresstotal" style="text-align:right">
-                <el-pagination
-                  background
-                  small
-                  :current-page="addressparam.content.pageNumber"
-                  @current-change="addresPageChange"
-                  :page-size="addressparam.content.pageSize"
-                  layout="total,prev, pager, next"
-                  :total="addresstotal">
-                </el-pagination>
-              </div>
-              <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
-            </el-popover>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <div>
+              <p class="inline-16"><b>{{selectEnterpriseInfo.enterprisename}}</b></p>
+              <el-popover
+                placement="bottom"
+                title="选择企业"
+                trigger="click"
+                v-model="visible4">
+                <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                  <el-input 
+                    size="small"  
+                    v-model="enterpriseParam.content.where.condition" 
+                    placeholder="请输入搜索内容" 
+                    style="width:150px"
+                    @keyup.enter.native="receiveAddress(enterpriseParam.content.pageNumber = 1)" @clear="receiveAddress(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                </div>
+                <el-table
+                  :data="enterpriseList"
+                  style="width: 100%"
+                  size="mini">
+                  <el-table-column
+                    prop="enterprisename"
+                    label="企业名称"
+                    width="150">
+                  </el-table-column>
+                  <el-table-column
+                    label="地址"
+                    width="360">
+                    <template slot-scope="scope">
+                      {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="操作"
+                    width="120">
+                    <template slot-scope="scope">
+                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),visible4=false)" size="mini">选 择</el-button>
+                      <!-- <delete-btn 
+                        message="确定删除当前地址吗?"
+                        nameId="20221009155903" 
+                        nameKey="contactsid" 
+                        :id="scope.row.contactsid"
+                        :isNumber="true"
+                        @deleteSuccess="receiveAddress"
+                      ></delete-btn> -->
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <!-- <div class="container" v-if="addresstotal" style="text-align:right">
+                  <el-pagination
+                    background
+                    small
+                    :current-page="enterpriseParam.content.pageNumber"
+                    @current-change="addresPageChange"
+                    :page-size="enterpriseParam.content.pageSize"
+                    layout="total,prev, pager, next"
+                    :total="addresstotal">
+                  </el-pagination>
+                </div> -->
+                <el-button slot="reference" type="text" size="mini">选择企业</el-button>
+              </el-popover>
+            </div>
+            <div>
+              <p class="inline-16"><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+              <el-popover
+                placement="bottom"
+                title="选择地址"
+                trigger="click"
+                v-model="visible">
+                <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                  <el-input 
+                    size="small"  
+                    v-model="addressparam.content.where.condition" 
+                    placeholder="请输入搜索内容" 
+                    style="width:150px"
+                    @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                  <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+                </div>
+                <el-table
+                  :data="receiveAddresslist"
+                  style="width: 100%"
+                  size="mini">
+                  <el-table-column
+                    prop="name"
+                    label="联系人"
+                    width="90">
+                  </el-table-column>
+                  <el-table-column
+                    prop="phonenumber"
+                    label="电话"
+                    width="120">
+                  </el-table-column>
+                  <el-table-column
+                    label="地址"
+                    width="360">
+                    <template slot-scope="scope">
+                      {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="操作"
+                    width="120">
+                    <template slot-scope="scope">
+                      <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                      <delete-btn 
+                        message="确定删除当前地址吗?"
+                        nameId="20221009155903" 
+                        nameKey="contactsid" 
+                        :id="scope.row.contactsid"
+                        :isNumber="true"
+                        @deleteSuccess="receiveAddress"
+                      ></delete-btn>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container" v-if="addresstotal" style="text-align:right">
+                  <el-pagination
+                    background
+                    small
+                    :current-page="addressparam.content.pageNumber"
+                    @current-change="addresPageChange"
+                    :page-size="addressparam.content.pageSize"
+                    layout="total,prev, pager, next"
+                    :total="addresstotal">
+                  </el-pagination>
+                </div>
+                <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
+              </el-popover>
+            </div>
             <small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small>
           </div>
         </div>
@@ -307,8 +370,11 @@ export default {
       visible1:false,
       visible2:false,
       visible3:false,
+      visible4:false,
       drawer:false,
       receiveAddresslist:[],
+      selectEnterpriseInfo:'',
+      enterpriseList:[],
       accountlist:[],
       rebateAccount:[],
       logisticcomlist:[],
@@ -345,6 +411,17 @@ export default {
           }
         }
       },
+      enterpriseParam: {
+          "id": 20230320134702,
+          "content": {
+              "pageNumber": 1,
+              "pageSize": 20,
+              "sys_enterpriseid": '',
+              "where": {
+                  "condition": ""
+              }
+          },
+      },
       addresstotal:0
     }
   },
@@ -394,6 +471,8 @@ export default {
 
       this.receiveAddress()
 
+      this.getEnterpriseList()
+
       this.queryUsedrebate()
 
       this.selectOptions()
@@ -405,9 +484,16 @@ export default {
         this.rebateamount = this.data.rebateamount
       }
     },
+    /* 获取当前经销商企业列表 */
+    async getEnterpriseList () {
+        this.enterpriseParam.content.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested(this.enterpriseParam)
+        this.enterpriseList = res.data
+        console.log(this.enterpriseList,'企业列表');
+    },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
-      this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
+      this.addressparam.content.sys_enterpriseid = this.selectEnterpriseInfo.sys_enterpriseid
       const res = await this.$api.requested(this.addressparam)
       this.addresstotal = res.total
       console.log(this.addresstotal);
@@ -427,6 +513,7 @@ export default {
       this.signbackstatus = this.data.signbackstatus
       this.saler_name = this.data.saler_name
       this.billdate = this.data.billdate
+      this.selectEnterpriseInfo = this.data.contactsEnterprise
     },
    
     async onSubmit() {

src/HManagement/marketing2/agent/details/modules/address/list.vue

@@ -1,22 +1,58 @@
 <template>
   <div>
-    <addContact v-if="tool.checkAuth($route.name,'addressMag')" @onAddSuccess="listData" :mainData="mainData"></addContact>
-    <tableLayout :layout="tablecols" :data="list" :custom="true" height="calc(100vh - 455px)" fixedName="operation">
-      <template v-slot:customcol="scope">
-        <p v-if="scope.column.columnname === 'province'">
-          {{scope.column.data['province']}}-{{scope.column.data['city']}}-{{scope.column.data['county']}}
-        </p>
-        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
-      </template>
-       <template v-slot:opreation="scope">
-        <edit-contact v-if="tool.checkAuth($route.name,'addressMag')" :mainData="mainData" :row="scope.data" @onAddSuccess="listData" class="inline-16"></edit-contact>
-        <el-popconfirm
-          title="确定删除吗？"
-          @confirm="deleteContacts(scope.data)">
-          <el-button v-if="tool.checkAuth($route.name,'addressMag')" size="small" type="text" slot="reference">删 除</el-button>
-        </el-popconfirm>
-      </template>
-    </tableLayout>
+    <addContact class="normal-margin inline-16" v-if="tool.checkAuth($route.name,'addressMag')" @onAddSuccess="listData" :mainData="mainData"></addContact>
+    <el-button type="primary" size="mini" v-if="tool.checkAuth($route.name,'addressMag')" :disabled="!selectRows.length" @click="deleteContacts(selectRows,true)">删 除</el-button>
+    <el-table
+        :data="list"
+        @select="selectRow" 
+        @select-all="selectAll"
+        style="width: 100%"
+        size="small"
+        border>
+        <el-table-column
+          type="selection"
+          width="45"
+          fixed>
+        </el-table-column>
+        <el-table-column
+          prop="name"
+          label="联系人">
+        </el-table-column>
+        <el-table-column
+          prop="phonenumber"
+          label="联系电话"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="province"
+          label="省市县"
+          width="100">
+          <template slot-scope="scope">
+            {{scope.row['province']}}-{{scope.row['city']}}-{{scope.row['county']}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="address"
+          label="地址"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="remarks"
+          label="备注"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          label="操作">
+          <template slot-scope="scope">
+            <edit-contact v-if="tool.checkAuth($route.name,'addressMag')" :mainData="mainData" :row="scope.row" @onAddSuccess="listData" class="inline-16"></edit-contact>
+            <el-popconfirm
+              title="确定删除吗？"
+              @confirm="deleteContacts([scope.row.contactsid])">
+              <el-button v-if="tool.checkAuth($route.name,'addressMag')" size="small" type="text" slot="reference">删 除</el-button>
+            </el-popconfirm>
+          </template> 
+        </el-table-column>
+    </el-table>
   </div>
 </template>
 
@@ -28,7 +64,8 @@ export default {
   data () {
     return {
       list:[],
-      param:{}
+      param:{},
+      selectRows:[]
     }
   },
   components:{
@@ -49,18 +86,54 @@ export default {
       })
       this.list = res.data
     },
-    async deleteContacts (row) {
+    async deleteContacts (idArr,all) {
+      if (all) {
+        return this.$confirm('确定删除当前选中数据吗?','提示',{
+          confirmButtonText:'确定',
+          cancelButtonText:'取消',
+          type:'warning'
+        }).then(async() => {
+          const res = await this.$api.requested({
+            "id": "20221009155903",
+            "version":1,
+            "content": {
+              "contactsids":idArr
+            }
+          })
+          if (res.msg != '成功') {
+            this.$message({
+              title:'提示',
+              message:res.data[0].errmsg,
+              type:'warning'
+            })
+          } else {
+            this.listData()
+          }
+        })
+      }
       const res = await this.$api.requested({
         "id": "20221009155903",
         "version":1,
         "content": {
-          "contactsid":row.contactsid
+          "contactsids":idArr
         }
       })
-      this.tool.showMessage(res,()=>{
+      if (res.msg != '成功') {
+        this.$message({
+          title:'提示',
+          message:res.data[0].errmsg,
+          type:'warning'
+        })
+      } else {
         this.listData()
-      })
-    }
+      }
+    },
+    selectRow (data) {
+      this.selectRows = data.map(item=>item.contactsid)
+    },
+    selectAll (data) {
+      this.selectRows = data.map(item=>item.contactsid)
+    },
   },
   mounted () {
     this.listData()

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

@@ -1,11 +1,19 @@
 <template>
     <div>
-      <add v-if="tool.checkAuth($route.name,'areaAuthAdd')" @onSuccess="alreadyAuthField" class="mt-10" />
+      <add class="inline-16 mt-10" v-if="tool.checkAuth($route.name,'areaAuthAdd')" @onSuccess="alreadyAuthField"/>
+      <el-button type="primary" size="mini" v-if="tool.checkAuth($route.name,'areaAuthAdd')" :disabled="!selectRows.length" @click="deleteField(selectRows,true)">删 除</el-button>
       <el-table
         :data="alfield"
+        @select="selectRow" 
+        @select-all="selectAll"
         style="width: 100%"
         size="small"
         border>
+        <el-table-column
+          type="selection"
+          width="45"
+          fixed>
+        </el-table-column>
         <el-table-column
           prop="tradefield"
           label="授权领域">
@@ -27,7 +35,7 @@
           <template slot-scope="scope">
             <el-popconfirm
               title="确定删除吗？"
-              @confirm="deleteField(scope.row)">
+              @confirm="deleteField([scope.row.sys_enterprise_tradefieldid])">
               <el-button v-if="tool.checkAuth($route.name,'areaAuthDel')" slot="reference" type="text" size="mini">删除</el-button>
             </el-popconfirm>
           </template>
@@ -44,6 +52,7 @@ import add from './add'
       return {
         alfield:[],
         dialogVisible:false,
+        selectRows:[],
         param:{
           "id": 20221223141802,
           "content": {
@@ -78,11 +87,34 @@ import add from './add'
         console.log(res.data);
         
       },
-      async deleteField (row) {
+      selectRow (data) {
+        this.selectRows = data.map(item=>item.sys_enterprise_tradefieldid)
+      },
+      selectAll (data) {
+        this.selectRows = data.map(item=>item.sys_enterprise_tradefieldid)
+      },
+      async deleteField (idArr,all=false) {
+        if (all) {
+          return this.$confirm('确定删除当前选中数据吗?','提示',{
+            confirmButtonText:'确定',
+            cancelButtonText:'取消',
+            type:'warning'
+          }).then(async() => {
+            const res = await this.$api.requested({
+              "id":20221223141702,
+              "content": {
+                "sys_enterprise_tradefieldids": idArr
+              },
+            })
+            this.tool.showMessage(res,()=>{
+              this.alreadyAuthField()
+            })
+          })
+        }
         const res = await this.$api.requested({
           "id":20221223141702,
           "content": {
-            "sys_enterprise_tradefieldids": [row.sys_enterprise_tradefieldid]
+            "sys_enterprise_tradefieldids": idArr
           },
         })
         this.tool.showMessage(res,()=>{

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

@@ -1,11 +1,35 @@
 <template>
   <div>
-    <add-sale-class class="normal-margin" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'classAdd') "/>
-    <tableLayout  :layout="tablecols" :data="saleClassList" :custom="false" height="calc(100vh - 405px)" fixedName="operation">
-      <template v-slot:opreation="scope">
-        <Del v-if="tool.checkAuth($route.name,'classDel')" :id="scope.data.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
-      </template>
-    </tableLayout>
+    <add-sale-class class="normal-margin inline-16" :data="data" @addSuccess="getClassList" v-if="tool.checkAuth($route.name,'classAdd') "/>
+    <el-button type="primary" size="mini" v-if="tool.checkAuth($route.name,'classAdd')" :disabled="!selectRows.length" @click="deleteRow(selectRows,true)">删 除</el-button>
+    <el-table
+        :data="saleClassList"
+        @select="selectRow" 
+        @select-all="selectAll"
+        style="width: 100%"
+        size="small"
+        border>
+        <el-table-column
+          type="selection"
+          width="45"
+          fixed>
+        </el-table-column>
+        <el-table-column
+          prop="itemclassfullname"
+          label="营销类别">
+        </el-table-column>
+        <el-table-column
+          prop="brandname"
+          label="品牌"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          label="操作">
+          <template slot-scope="scope">
+            <Del v-if="tool.checkAuth($route.name,'classDel')" :id="scope.row.sys_enterprise_saleclassid" @onSuccess="getClassList"/>
+          </template> 
+        </el-table-column>
+    </el-table>
   </div>
 </template>
 
@@ -18,7 +42,8 @@ export default {
     return {
       saleClassList:[],
       tablecols:[],
-      param:{}
+      param:{},
+      selectRows:[]
     };
   },
   components:{addSaleClass,Del},
@@ -43,7 +68,32 @@ export default {
         },
       })
       this.saleClassList = res.data
-    }
+    },
+    selectRow (data) {
+      this.selectRows = data.map(item=>item.sys_enterprise_saleclassid)
+    },
+    selectAll (data) {
+      this.selectRows = data.map(item=>item.sys_enterprise_saleclassid)
+    },
+    deleteRow (idArr) {
+      this.$confirm('确定删除当前选中数据吗?','提示',{
+        confirmButtonText:'确定',
+        cancelButtonText:'取消',
+        type:'warning'
+      }).then(() => {
+        this.$api.requested({
+          "id": 20220924134402,
+          "content": {
+              "sys_enterprise_saleclassids": idArr
+          },
+        }).then(res=>{
+          this.tool.showMessage(res,()=>{
+            this.getClassList()
+          })
+        })
+      })
+      
+    },
   },
   mounted() {
     this.getClassList()

src/HManagement/marketing2/agent/details/modules/saleclass/modules/addSaleClass.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="small" type="primary" icon="el-icon-plus" @click="dialogVisible = true">新建
+    <el-button size="mini" type="primary" icon="el-icon-plus" @click="dialogVisible = true">新建
     </el-button>
     <el-dialog title="营销类别授权" append-to-body :visible.sync="dialogVisible" width="400px">
       <el-cascader v-model="selectArr" ref="select" @change="change" :options="deplist" :props="{ multiple: true, checkStrictly: true }" clearable size="small">

src/HManagement/notice/list/modules/add_notice.vue

@@ -181,8 +181,26 @@ export default {
     }
   },
   methods: {
-    onUploadSuccess() {
-      this.queryNoticeMain()
+    async onUploadSuccess() {
+      const res = await this.$api.requested({
+        "id": "20221101095003",
+        // "method": "queryNoticeMain",
+        "content": {
+          "sat_noticeid": this.$route.query.id
+        }
+      })
+      console.log(res.data);
+      
+      this.attinfo_video = res.data.attinfos.filter(e => {
+        if (e.postfix === 'mp4' || e.postfix === 'ogg' || e.postfix === 'webm') {
+          return e
+        }
+      })
+      this.attinfo_attachment = res.data.attinfos.filter(e => {
+        if (e.postfix !== 'mp4' && e.postfix !== 'ogg' && e.postfix !== 'webm') {
+          return e
+        }
+      })
     },
     async emitNotice () {
       const res2 = await this.$api.requested({

src/HManagement/notice/list/modules/detailed.vue

@@ -209,9 +209,9 @@ export default {
   },
   methods: {
     onUploadSuccess() {
-      this.form.status !== '新建' ? this.queryNoticeMain() : this.onSubmit()
+      this.form.status !== '新建' ? this.queryNoticeMain() : this.onSubmit(false)
     },
-    onSubmit() {
+    onSubmit(upload=true) {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
         this.form.content = this.$refs.editor.html
@@ -221,8 +221,11 @@ export default {
           "content": this.form
         })
         this.tool.showMessage(res,() => {
-          this.edit = true
-          this.save = false
+          if (upload) {
+            this.edit = true
+            this.save = false
+          }
+          
           this.insertCoursewareauth()
           this.queryNoticeMain()
           this.$emit("updateSuccess")

src/HManagement/submit/list/modules/submit_add.vue

@@ -56,7 +56,7 @@
               <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain();fileHandleSuccess()" :onlyread="store.state.pageOnlyRead">
                 <upload slot="upload" :folderid="folderid"
                           :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: $route.query.id, usetype: 'default' }"
-                          @onSuccess="fileHandleSuccess"></upload>
+                          @onSuccess="uploadSuccess"></upload>
               </attachmentList>
             </div>
           </el-col>
@@ -205,7 +205,8 @@ export default {
         "sat_submiteditmodelid": "0",
         "begdate": "",
         "enddate": "",
-        "type": []
+        "type": [],
+        attinfos:[]
       }
     }
   },
@@ -227,22 +228,21 @@ export default {
       this.form.status !== '新建' ? store.state.pageOnlyRead = true : store.state.pageOnlyRead = false
       
     },
-    async fileHandleSuccess () {
+    async uploadSuccess () {
       const res = await this.$api.requested({
-        /*"classname": "webmanage.saletool.submitedit.submitedit",
-        "method": "insertorupdate",*/
-        "id":20221102093902,
+        "id":"20221102093902",
         "content": {
-          sat_submiteditmodelid:this.$route.query.id
+          "sat_submiteditmodelid": this.$route.query.id
         }
       })
-      this.form = Object.assign({},this.form,res.data)
-      console.log(this.form);
-      
+      console.log(res.data);
+      this.form.attinfos = res.data.attinfos      
+      console.log(this.form.attinfos);
     },
     onSubmit() {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;
+        this.form.sat_submiteditmodelid = this.$route.query.id
         const res = await this.$api.requested({
           /*"classname": "webmanage.saletool.submitedit.submitedit",
           "method": "insertorupdate",*/

src/HManagement/submit/list/modules/submit_edit.vue

@@ -62,10 +62,10 @@
                 </el-row>
               </div>
               <div class="container normal-panel normal-margin">
-                <attachmentList :attinfos="form.attinfos" @onSuccess="querySubmitMain" :onlyread="store.state.pageOnlyRead">
+                <attachmentList :attinfos="form.attinfos" @onSuccess="uploadSuccess" :onlyread="store.state.pageOnlyRead">
                   <upload slot="upload" :folderid="folderid"
                           :bindData="{ ownertable: 'sat_submiteditmodel', ownerid: form.sat_submiteditmodelid, usetype: 'default' }"
-                          @onSuccess="querySubmitMain()"></upload>
+                          @onSuccess="uploadSuccess()"></upload>
                 </attachmentList>
               </div>
             </el-col>
@@ -174,7 +174,8 @@ export default {
         "sat_submiteditmodelid": "0",
         "begdate": "",
         "enddate": "",
-        "type": []
+        "type": [],
+        "attinfos":[]
       },
     }
   },
@@ -219,6 +220,22 @@ export default {
 
       this.status = true
     },
+    async uploadSuccess () {
+      const res = await this.$api.requested({
+        "id":"20221102093902",
+        "content": {
+          "sat_submiteditmodelid": this.$route.query.id
+        }
+      })
+      console.log(res.data);
+      this.form.attinfos = res.data.attinfos
+      this.form.status !== '新建' ? store.state.pageOnlyRead = true : store.state.pageOnlyRead = false
+      if(!this.save) {
+        this.$store.dispatch('pageOnlyRead',true)
+      } else {
+        this.$store.dispatch('pageOnlyRead',false)
+      }
+    },
     onSubmit() {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false;

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -116,77 +116,138 @@
         </div>
         <div style="flex:1;">
           <div class="mt-10">
-            <p class="normal-title inline-16" >收货信息</p>
-            <el-popover
-              placement="bottom"
-              title="选择地址"
-              trigger="click"
-              v-model="visible">
-              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
-                <el-input 
-                  size="small"  
-                  v-model="addressparam.content.where.condition" 
-                  placeholder="请输入搜索内容" 
-                  style="width:150px"
-                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
-                <addAddressInfo @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
-              </div>
-              <el-table
-                :data="receiveAddresslist"
-                style="width: 100%"
-                size="mini">
-                <el-table-column
-                  prop="name"
-                  label="联系人"
-                  width="90">
-                </el-table-column>
-                <el-table-column
-                  prop="phonenumber"
-                  label="电话"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  label="地址"
-                  width="360">
-                  <template slot-scope="scope">
-                    {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="操作"
-                  width="120">
-                  <template slot-scope="scope">
-                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
-                    <delete-btn 
-                      message="确定删除当前地址吗?"
-                      nameId="20221009155903" 
-                      nameKey="contactsid" 
-                      :id="scope.row.contactsid"
-                      :isNumber="true"
-                      @deleteSuccess="receiveAddress"
-                    ></delete-btn>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <div class="container" style="text-align:right">
-                <el-pagination
-                  background
-                  small
-                  :current-page="addressparam.content.pageNumber"
-                  :page-size="addressparam.content.pageSize"
-                  @current-change="addresPageChange"
-                  layout="total,prev, pager, next"
-                  :total="addresstotal">
-                </el-pagination>
-              </div>
-              <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
-            </el-popover>
+            <p class="normal-title inline-16">收货信息</p>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span></p>
-              <p><small>{{defaultData.re_info.phonenumber}}</small></p>
-            <p><small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small></p>
-            <p style="height: 35px"></p>
+            <div>
+              <p class="inline-16"><b>{{selectEnterpriseInfo.enterprisename}}</b></p>
+              <el-popover
+                placement="bottom"
+                title="选择企业"
+                trigger="click"
+                v-model="visible4">
+                <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                  <el-input 
+                    size="small"  
+                    v-model="enterpriseParam.content.where.condition" 
+                    placeholder="请输入搜索内容" 
+                    style="width:150px"
+                    @keyup.enter.native="receiveAddress(enterpriseParam.content.pageNumber = 1)" @clear="receiveAddress(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                </div>
+                <el-table
+                  :data="enterpriseList"
+                  style="width: 100%"
+                  size="mini">
+                  <el-table-column
+                    prop="enterprisename"
+                    label="企业名称"
+                    width="150">
+                  </el-table-column>
+                  <el-table-column
+                    label="地址"
+                    width="360">
+                    <template slot-scope="scope">
+                      {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="操作"
+                    width="120">
+                    <template slot-scope="scope">
+                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),visible4=false)" size="mini">选 择</el-button>
+                      <!-- <delete-btn 
+                        message="确定删除当前地址吗?"
+                        nameId="20221009155903" 
+                        nameKey="contactsid" 
+                        :id="scope.row.contactsid"
+                        :isNumber="true"
+                        @deleteSuccess="receiveAddress"
+                      ></delete-btn> -->
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <!-- <div class="container" v-if="addresstotal" style="text-align:right">
+                  <el-pagination
+                    background
+                    small
+                    :current-page="enterpriseParam.content.pageNumber"
+                    @current-change="addresPageChange"
+                    :page-size="enterpriseParam.content.pageSize"
+                    layout="total,prev, pager, next"
+                    :total="addresstotal">
+                  </el-pagination>
+                </div> -->
+                <el-button slot="reference" type="text" size="mini">选择企业</el-button>
+              </el-popover>
+            </div>
+            <div>
+              <p class="inline-16"><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+              <el-popover
+                placement="bottom"
+                title="选择地址"
+                trigger="click"
+                v-model="visible">
+                <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                  <el-input 
+                    size="small"  
+                    v-model="addressparam.content.where.condition" 
+                    placeholder="请输入搜索内容" 
+                    style="width:150px"
+                    @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                  <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+                </div>
+                <el-table
+                  :data="receiveAddresslist"
+                  style="width: 100%"
+                  size="mini">
+                  <el-table-column
+                    prop="name"
+                    label="联系人"
+                    width="90">
+                  </el-table-column>
+                  <el-table-column
+                    prop="phonenumber"
+                    label="电话"
+                    width="120">
+                  </el-table-column>
+                  <el-table-column
+                    label="地址"
+                    width="360">
+                    <template slot-scope="scope">
+                      {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="操作"
+                    width="120">
+                    <template slot-scope="scope">
+                      <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                      <delete-btn 
+                        message="确定删除当前地址吗?"
+                        nameId="20221009155903" 
+                        nameKey="contactsid" 
+                        :id="scope.row.contactsid"
+                        :isNumber="true"
+                        @deleteSuccess="receiveAddress"
+                      ></delete-btn>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container" v-if="addresstotal" style="text-align:right">
+                  <el-pagination
+                    background
+                    small
+                    :current-page="addressparam.content.pageNumber"
+                    @current-change="addresPageChange"
+                    :page-size="addressparam.content.pageSize"
+                    layout="total,prev, pager, next"
+                    :total="addresstotal">
+                  </el-pagination>
+                </div>
+                <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
+              </el-popover>
+            </div>
+            <small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small>
           </div>
         </div>
         
@@ -285,8 +346,11 @@ export default {
       visible1:false,
       visible2:false,
       visible3:false,
+      visible4:false,
       drawer:false,
       receiveAddresslist:[],
+      selectEnterpriseInfo:'',
+      enterpriseList:[],
       accountlist:[],
       rebateAccount:[],
       logisticcomlist:[],
@@ -321,7 +385,18 @@ export default {
             "workaddress":1
           }
         }
-      }
+      },
+      enterpriseParam: {
+        "id": 20230320134702,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "sys_enterpriseid": '',
+            "where": {
+                "condition": ""
+            }
+        },
+      },
     }
   },
   created () {
@@ -349,6 +424,8 @@ export default {
 
       this.receiveAddress()
 
+      this.getEnterpriseList()
+
       this.queryUsedrebate()
 
       this.selectOptions()
@@ -360,6 +437,13 @@ export default {
         this.rebateamount = this.data.rebateamount
       }
     },
+    /* 获取当前经销商企业列表 */
+    async getEnterpriseList () {
+        this.enterpriseParam.content.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested(this.enterpriseParam)
+        this.enterpriseList = res.data
+        console.log(this.enterpriseList,'企业列表');
+    },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
       this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
@@ -378,6 +462,7 @@ export default {
       this.financiallist = this.data.pay_finance
       this.saletype = this.data.saletype
       this.signbackstatus = this.data.signbackstatus
+      this.selectEnterpriseInfo = this.data.contactsEnterprise
     },
    
     async onSubmit() {

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData"></addorderline>
+    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')"></addorderline>
     <el-table :data="list" size="mini" border>
       <el-table-column prop="sonum" label="订单号" width="150" fixed></el-table-column>
       <el-table-column prop="type" label="订单类型" width="90"></el-table-column>
@@ -89,6 +89,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.listData()
+        this.$emit('onSuccess')
       })
     } 
   },

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -107,73 +107,136 @@
         <div style="flex:1;">
           <div class="mt-10">
             <p class="normal-title inline-16">收货信息</p>
-            <el-popover
-              placement="bottom"
-              title="选择地址"
-              trigger="click"
-              v-model="visible">
-              <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
-                <el-input 
-                  size="small"  
-                  v-model="addressparam.content.where.condition" 
-                  placeholder="请输入搜索内容" 
-                  style="width:150px"
-                  @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
-                <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
-              </div>
-              <el-table
-                :data="receiveAddresslist"
-                style="width: 100%"
-                size="mini">
-                <el-table-column
-                  prop="name"
-                  label="联系人"
-                  width="90">
-                </el-table-column>
-                <el-table-column
-                  prop="phonenumber"
-                  label="电话"
-                  width="120">
-                </el-table-column>
-                <el-table-column
-                  label="地址"
-                  width="360">
-                  <template slot-scope="scope">
-                    {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label="操作"
-                  width="120">
-                  <template slot-scope="scope">
-                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
-                    <delete-btn 
-                      message="确定删除当前地址吗?"
-                      nameId="20221009155903" 
-                      nameKey="contactsid" 
-                      :id="scope.row.contactsid"
-                      :isNumber="true"
-                      @deleteSuccess="receiveAddress"
-                    ></delete-btn>
-                  </template>
-                </el-table-column>
-              </el-table>
-              <div class="container" style="text-align:right">
-                <el-pagination
-                  background
-                  small
-                  :current-page="addressparam.content.pageNumber"
-                  @current-change="addresPageChange"
-                  :page-size="addressparam.content.pageSize"
-                  layout="total,prev,pager, next"
-                  :total="addresstotal">
-                </el-pagination>
-              </div>
-              <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
-            </el-popover>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <div>
+              <p class="inline-16"><b>{{selectEnterpriseInfo.enterprisename}}</b></p>
+              <el-popover
+                placement="bottom"
+                title="选择企业"
+                trigger="click"
+                v-model="visible4">
+                <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                  <el-input 
+                    size="small"  
+                    v-model="enterpriseParam.content.where.condition" 
+                    placeholder="请输入搜索内容" 
+                    style="width:150px"
+                    @keyup.enter.native="receiveAddress(enterpriseParam.content.pageNumber = 1)" @clear="receiveAddress(enterpriseParam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                </div>
+                <el-table
+                  :data="enterpriseList"
+                  style="width: 100%"
+                  size="mini">
+                  <el-table-column
+                    prop="enterprisename"
+                    label="企业名称"
+                    width="150">
+                  </el-table-column>
+                  <el-table-column
+                    label="地址"
+                    width="360">
+                    <template slot-scope="scope">
+                      {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="操作"
+                    width="120">
+                    <template slot-scope="scope">
+                      <el-button class="inline-16" type="text" @click="(selectEnterpriseInfo = scope.row,receiveAddress(),visible4=false)" size="mini">选 择</el-button>
+                      <!-- <delete-btn 
+                        message="确定删除当前地址吗?"
+                        nameId="20221009155903" 
+                        nameKey="contactsid" 
+                        :id="scope.row.contactsid"
+                        :isNumber="true"
+                        @deleteSuccess="receiveAddress"
+                      ></delete-btn> -->
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <!-- <div class="container" v-if="addresstotal" style="text-align:right">
+                  <el-pagination
+                    background
+                    small
+                    :current-page="enterpriseParam.content.pageNumber"
+                    @current-change="addresPageChange"
+                    :page-size="enterpriseParam.content.pageSize"
+                    layout="total,prev, pager, next"
+                    :total="addresstotal">
+                  </el-pagination>
+                </div> -->
+                <el-button slot="reference" type="text" size="mini">选择企业</el-button>
+              </el-popover>
+            </div>
+            <div>
+              <p class="inline-16"><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+              <el-popover
+                placement="bottom"
+                title="选择地址"
+                trigger="click"
+                v-model="visible">
+                <div class="flex-align-center" style="justify-content:space-between;margin-bottom:10px">
+                  <el-input 
+                    size="small"  
+                    v-model="addressparam.content.where.condition" 
+                    placeholder="请输入搜索内容" 
+                    style="width:150px"
+                    @keyup.enter.native="receiveAddress(addressparam.content.pageNumber = 1)" @clear="receiveAddress(addressparam.content.pageNumber = 1)" clearable></el-input>&nbsp;
+                  <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
+                </div>
+                <el-table
+                  :data="receiveAddresslist"
+                  style="width: 100%"
+                  size="mini">
+                  <el-table-column
+                    prop="name"
+                    label="联系人"
+                    width="90">
+                  </el-table-column>
+                  <el-table-column
+                    prop="phonenumber"
+                    label="电话"
+                    width="120">
+                  </el-table-column>
+                  <el-table-column
+                    label="地址"
+                    width="360">
+                    <template slot-scope="scope">
+                      {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="操作"
+                    width="120">
+                    <template slot-scope="scope">
+                      <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                      <delete-btn 
+                        message="确定删除当前地址吗?"
+                        nameId="20221009155903" 
+                        nameKey="contactsid" 
+                        :id="scope.row.contactsid"
+                        :isNumber="true"
+                        @deleteSuccess="receiveAddress"
+                      ></delete-btn>
+                    </template>
+                  </el-table-column>
+                </el-table>
+                <div class="container" v-if="addresstotal" style="text-align:right">
+                  <el-pagination
+                    background
+                    small
+                    :current-page="addressparam.content.pageNumber"
+                    @current-change="addresPageChange"
+                    :page-size="addressparam.content.pageSize"
+                    layout="total,prev, pager, next"
+                    :total="addresstotal">
+                  </el-pagination>
+                </div>
+                <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
+              </el-popover>
+            </div>
             <small>{{defaultData.re_info.province?defaultData.re_info.province:'--'}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:''}}</small>
           </div>
         </div>
@@ -274,8 +337,11 @@ export default {
       visible1:false,
       visible2:false,
       visible3:false,
+      visible4:false,
       drawer:false,
       receiveAddresslist:[],
+      selectEnterpriseInfo:'',
+      enterpriseList:[],
       accountlist:[],
       rebateAccount:[],
       logisticcomlist:[],
@@ -310,6 +376,17 @@ export default {
           }
         }
       },
+      enterpriseParam: {
+        "id": 20230320134702,
+        "content": {
+            "pageNumber": 1,
+            "pageSize": 20,
+            "sys_enterpriseid": '',
+            "where": {
+                "condition": ""
+            }
+        },
+      },
       addresstotal:0
     }
   },
@@ -354,6 +431,8 @@ export default {
 
       this.receiveAddress()
 
+      this.getEnterpriseList()
+
       this.queryUsedrebate()
 
       this.selectOptions()
@@ -365,6 +444,13 @@ export default {
         this.rebateamount = this.data.rebateamount
       }
     },
+    /* 获取当前经销商企业列表 */
+    async getEnterpriseList () {
+        this.enterpriseParam.content.sys_enterpriseid = this.data.sys_enterpriseid
+        const res = await this.$api.requested(this.enterpriseParam)
+        this.enterpriseList = res.data
+        console.log(this.enterpriseList,'企业列表');
+    },
     // 收货信息:合作企业联系人
     async receiveAddress (fn) {
       this.addressparam.content.sys_enterpriseid = this.data.sys_enterpriseid
@@ -382,6 +468,8 @@ export default {
       this.financiallist = this.data.pay_finance
       this.saletype = this.data.saletype
       this.signbackstatus = this.data.signbackstatus
+      this.selectEnterpriseInfo = this.data.contactsEnterprise
+
     },
    
     async onSubmit() {

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData"></addorderline>
+    <addorderline :status="status" :sys_enterpriseid="sys_enterpriseid" @onSuccess="listData();$emit('onSuccess')"></addorderline>
     <el-table :data="list" size="mini" border>
       <el-table-column prop="sonum" label="订单号" width="150" fixed></el-table-column>
       <el-table-column prop="type" label="订单类型" width="90"></el-table-column>
@@ -89,6 +89,7 @@ export default {
       })
       this.tool.showMessage(res,()=>{
         this.listData()
+        this.$emit('onSuccess')
       })
     } 
   },

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -42,7 +42,7 @@
       </el-popover>
     </div>
     <div style="padding:10px">
-      <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 1" v-for="men in item.team" :key="men.index">
+      <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 0" v-for="men in item.team" :key="men.index">
         <div class="avatar inline-16"  :class="men.isleader === 1?'leader':''" >
           <img class="avatar__image" v-if="men.headpic" :src="men.headpic" alt="">
           <p v-else>{{men.name.substr(0, 1)}}</p>
@@ -196,6 +196,7 @@ export default {
       let team = data.filter(e=>{
         return e.isleader !== 1
       })
+      // console.log(data,team,'团队数据')
       if (team.length === 0) return true
     },
     setClick(row){

src/components/selectAgent/agent/list.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="container normal-panel">
-    <p class="normal-title normal-margin">经销商信息</p>
     <div class="flex-align-center flex-between normal-margin">
-      <el-input style="width:270px" placeholder="请输入内容" v-model="param.content.where.condition" class="input-with-select" size="small" clearable>
-        <el-button slot="append" icon="el-icon-search"  @click="query_agent(param.content.sa_saleareaid)">查 询</el-button>
+      <el-input style="width:270px" placeholder="请输入内容" @clear="query_agent(data.sa_saleareaid,param.content.pageNumber=1)" v-model="param.content.where.condition" class="input-with-select" size="small" clearable>
+        <el-button slot="append" icon="el-icon-search"  @click="query_agent(data.sa_saleareaid)">查 询</el-button>
       </el-input>
       <slot name="add"></slot>
     </div>
@@ -38,6 +37,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   props:['data'],
   data () {
@@ -51,7 +51,8 @@ export default {
         "content": {
           "pageSize":20,
           "pageNumber":1,
-          "sa_saleareaids":null,
+          "isAll":1,
+          "sa_saleareaids":[],
           "containssub": 1,
           "sa_saleareaid":'',
           "where":{}
@@ -61,25 +62,25 @@ export default {
   },
   methods:{
     async query_agent (sa_saleareaid) {
-      this.param.content.sa_saleareaids = [sa_saleareaid]
       const res = await this.$api.requested(this.param)
       this.list = res.data
       this.total = res.total
       this.currentPage = res.pageNumber
+      console.log(this.list,'出发啊啊啊');
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val
-      this.query_agent(this.param.content.sa_saleareaid)
+      this.query_agent(this.data.sa_saleareaid)
     },
     handleCurrentChange(val) {
       // console.log(`当前页: ${val}`);
       this.param.content.pageNumber = val
-      this.query_agent(this.param.content.sa_saleareaid)
+      this.query_agent(this.data.sa_saleareaid)
     }
   },
   mounted () {
-    // this.query_agent()
+    this.query_agent()
   },
   created () {
     // 获取角色表结构

src/components/selectAgent/index.vue

@@ -4,10 +4,10 @@
     <el-dialog :title="titleData" append-to-body :visible.sync="dialogTableVisible" width="960px">
       <div class="flex">
         <!-- 营销区域列表 -->
-        <areaTree ref="arealist" style="width:200px" @onClick="onClick">
-        </areaTree>
+        <!-- <areaTree ref="arealist" style="width:200px" @onClick="onClick">
+        </areaTree> -->
         <div class="main" style="flex:1 0 auto;">
-          <agent ref="agent">
+          <agent ref="agent" :data="areaInfo">
             <template v-slot:detail="scope">
               <div class="inline-16">
                 <el-button  type="text" size="mini" @click="selectAgent(scope.data)">选 择</el-button>