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

# Conflicts:
#	src/HManagement/siteManage/securityConfig/modules/edit.vue

src/HDrpManagement/logisticcom/index.vue

@@ -4,7 +4,8 @@
     <basicLayout 
       ref="basicLayout" 
       :oldFormPath="{
-        add:'HDrpManagement/logisticcom/modules'
+        add:'HDrpManagement/logisticcom/modules',
+        edit:'HDrpManagement/logisticcom/modules'
       }"
       tableName="logisticcomTable" 
       idName="sa_logiscompid" 

src/HDrpManagement/logisticcom/modules/add.vue

@@ -80,7 +80,22 @@ export default {
       this.form = Object.assign({},this.form,row)
     },
     cancelDrawer () {
-      this.form = {}
+      this.form = {
+        "sa_logiscompid":0,//传0时新增
+        "sys_enterpriseid": 0,//传0时新增
+        "kd100id": "",
+        "province":"",
+        "city":"",
+        "county":"",
+        "address":"",
+        "enterprisename":"",
+        "abbreviation":"",
+        "taxno":"",
+        "grade":1,
+        "industry":"",
+        "contact":"",
+        "phonenumber":""
+      }
       this.$refs['ent'].form = {}
     },
     async onSubmit () {

src/HDrpManagement/logistics/details/index.vue

@@ -11,14 +11,14 @@
           ownertable="sa_logistics"
           delApiId="20221122132904"
           tags=""
-          :tabs="['基础信息','物流单明细','装箱信息']"
+          :tabs="['基础信息','物流单明细','装箱信息','物流信息']"
           @pageChange="pageChange"
           @onEditSuccess="queryMainData($route.query.id)">
         <div slot="tags">
         </div>
         <div slot="customOperation" >
-          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '新建'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
+          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status !== '收货'" @click="onConfimRec">确认收货</el-button>
+          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData"></defalutInfo>
@@ -31,6 +31,9 @@
           <addBox class="mt-10" @onSuccess="onBoxSuccess"></addBox>
           <boxlist ref="boxlist"></boxlist>
         </div>
+        <div  slot="slot3">
+          <courierRecords></courierRecords>
+        </div>
       </basicDetails>
     </div>
 </template>
@@ -41,6 +44,7 @@
   import dismx from '../modules/productlist.vue'
   import addBox from './tabs/logisticsBox/add.vue'
   import boxlist from './tabs/logisticsBox/logisticsBox.vue'
+  import courierRecords from './tabs/courierRecords.vue'
   export default {
     name: "detail",
     data() {
@@ -54,7 +58,8 @@
       dispatchTable,
       dismx,
       addBox,
-      boxlist
+      boxlist,
+      courierRecords
     },
     methods:{
       async queryMainData(id) {

src/HDrpManagement/logistics/details/tabs/courierRecords.vue

@@ -0,0 +1,40 @@
+<template>
+  <div>
+    <el-timeline>
+      <el-timeline-item
+        v-for="(item, index) in list"
+        :key="index"
+        :color="index == 0?'#3874f6':''"
+        :timestamp="item.time">
+        {{item.context}}
+      </el-timeline-item>
+    </el-timeline>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      list:[]
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested({
+        "id": "20230110135004",
+        "content": {
+          "sa_logisticsid":this.$route.query.id
+        }
+      })
+      this.list = res.data.data
+    }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -122,6 +122,9 @@ export default {
         }
       })
       this.tool.showMessage(res,()=>{
+        this.form = {}
+        this.tableData = []
+        this.setcol = 24
         this.$emit('onSuccess')
         this.drawer = false
       })

src/HDrpManagement/logistics/details/tabs/logisticsBox/edit.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button type="text" size="small" @click="onShow(drawer = true)">编 辑</el-button>
     <el-drawer
-      title="新建装箱信息"
+      title="编辑装箱信息"
       :visible.sync="drawer"
       :with-header="false"
       append-to-body
@@ -158,6 +158,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 999,
+          "sa_logisticsid":this.$route.query.id,
           "sa_logistics_boxid":this.data.sa_logistics_boxid,
           "where": {
             "condition": ""

src/HDrpManagement/logistics/details/tabs/logisticsBox/logisticsBoxmx.vue

@@ -72,6 +72,7 @@ export default {
   },
   methods:{
     async listData (id) {
+      this.params.content.sa_logisticsid = this.$route.query.id
       this.params.content.sa_logistics_boxid = id
 
       const res = await this.$api.requested(this.params)

src/HDrpManagement/logistics/modules/edit.vue

@@ -19,7 +19,7 @@ ed<template>
           <logisticcom ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
         </el-form-item>
         <el-form-item label="物流单号">
-          <el-input v-model="form.billno" placeholder="物流单号"></el-input>
+          <el-input v-model="form.logisticno" placeholder="物流单号"></el-input>
         </el-form-item>
         <el-form-item label="寄付方式">
           <el-select v-model="form.paytype" placeholder="请选择">
@@ -158,7 +158,7 @@ export default {
           "sys_enterpriseid": this.enterpriseInfo.sys_enterpriseid,
           "sa_logiscompid": this.form.sa_logiscompid,
           "remarks": "",
-          "logisticno": "",
+          "logisticno": this.form.logisticno,
           "paytype": this.form.paytype,
           "billdate":this.form.billdate,
           "freightamount":this.form.freightamount,

src/HDrpManagement/rebatesettlement/details/index.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <basicDetails
+        ref="details"
+        :titleText="`${mainData.accountno}-${mainData.name}`"
+        :oldFormPath="{edit:'HDrpManagement/rebatesettlement/modules'}"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        turnPageId="20230104194002"
+        idname="userid"
+        ownertable="sys_users"
+        tags=""
+        :tabs="['员工信息','角色信息']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+      </div>
+      <div slot="customOperation" >
+      </div>
+      <div slot="slot0" >
+      </div>
+      <div slot="slot1" >
+      </div>
+    </basicDetails>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "detail",
+  data() {
+    return {
+      mainData:{},
+      mainAreaData:{}
+    }
+  },
+  components:{
+  },
+  methods:{
+    async queryMainData(id) {
+      const res = await this.$api.requested({
+        "classname": "webmanage.users.users",
+        "method": "query_userMain",
+        "content": {
+          "userid": this.$route.query.id
+        }
+      })
+      this.mainData = res.data
+    },
+    changeDataStructure() {
+      this.mainAreaData = [
+        {
+          label:'账号类型',
+          value:this.mainData.usertypename
+        },
+        {
+          label:'状态',
+          value:this.minaInfo.status === 'ACTIVE'?'启用':this.minaInfo.status === 'INACTIVE'?'停用':'其他'
+        },
+        {
+          label:'联系方式',
+          value:this.mainData.phonenumber
+        },
+        {
+          label:'上级企业',
+          value:this.mainData.superiorenterprisename
+        },
+        {
+          label:'成交状态',
+          value:this.mainData.tradingstatus
+        },
+        {
+          label:'负责人',
+          value:this.mainData.leader[0]?this.mainData.leader[0].name:""
+        },
+        {
+          label:'最近跟近时间',
+          value:''
+        },
+        {
+          label:'所属公海',
+          value:this.mainData.poolname
+        }
+      ]
+    },
+    // 监听切换数据,上一页,下一页
+    pageChange (id,rowindex,tabIndex) {
+      this.flag = false
+      tabIndex = this.$route.query.tabIndex
+      this.$router.replace({path:'/customerDetail',query:{id:id,rowindex:rowindex,tabIndex:tabIndex}})
+      this.queryMainData(id)
+    },
+    onSuccess(){
+      this.visible = false
+      this.queryMainData(this.$route.query.id)
+      this.$emit('onSuccess')
+    }
+  },
+  mounted () {
+    this.queryMainData(this.$route.query.id)
+  },
+  created() {
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/rebatesettlement/index.vue

@@ -0,0 +1,50 @@
+
+<template>
+  <div>
+    <basicLayout 
+      ref="basicLayout" 
+      :oldFormPath="{
+        add:'HDrpManagement/rebatesettlement/modules'
+      }"
+      tableName="rebatesettlementTable" 
+      idName="sa_rebatesettlementid" 
+      :apiId="{query:20230104194002,del:20230104193402}"
+      :options="options"
+      :detailPath="{
+        path:'/account_details'
+      }">
+      <div slot="custom"></div>
+      <template v-slot:tbList="scope">
+        <div>
+          {{scope.data.column.data[[scope.data.column.columnname]]}}
+        </div>
+      </template>
+      <template v-slot:tbOpreation="scope">
+      </template>
+    </basicLayout>
+  </div>
+</template>
+
+<script>
+/**
+ * @basicLayout 提供this.$ref['basicLayout'].listData()方法查询列表信息
+ * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹
+ * @param {string} tableName 开发端配置的表格名称
+ * @param {String} idName 数据主id名称
+ * @param {object} apiId:{query:查询的接口id,del:删除的接口id} 
+ * @param {Array} options:{label:描述,value:值} 
+ */
+export default {
+  data () {
+    return {
+      options:[]
+      
+    }
+  },
+  methods:{
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/rebatesettlement/modules/add.vue

@@ -0,0 +1,12 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/rebatesettlement/modules/edit.vue

@@ -0,0 +1,12 @@
+<template>
+  <div></div>
+</template>
+
+<script>
+export default {
+
+}
+
+</script>
+<style>
+</style>

src/HManagement/siteManage/securityConfig/modules/edit.vue

@@ -135,8 +135,6 @@ export default {
         "content": {
         }
       })
-      console.log(res.data,"获取的数据")
-      /*this.form = Object.assign({},res.data,this.form)*/
       this.form = {
         "address": res.data.address,
         "abbreviation": res.data.abbreviation,
@@ -150,7 +148,6 @@ export default {
         "contact": res.data.contact,
         "taxno": res.data.taxno
       }
-      console.log(this.form,"表单信息")
       this.mainData = res.data
     },
     async deleteFileLink (item) {

src/HManagement/siteManage/securityConfig/modules/editCopy.vue

@@ -51,8 +51,6 @@ export default {
       siteinfo:'siteinfo'
     }),
     show () {
-      console.log(this.siteinfo);
-      
       if (this.siteinfo.attinfos.some(item=>item.usetype === 'actionlogo')) {
         return false
       } else {

src/SDrpManagement/Products/modules/ProductDetails.vue

@@ -28,10 +28,10 @@
       
       <el-button class="normal-margin" type="primary" style="width:200px" icon="el-icon-shopping-cart-full" @click="addCart">加入购物车</el-button>
       <div style="display:flex">
-        <p>相关链接:&emsp;</p>
+        <p style="width:150px">相关链接:&emsp;</p>
         <div>
           <div v-for="item in selectProduct.technicalinfo" :key="item.index">
-            <a class="file-link" :href="item.url">{{item.document}}</a>
+            <a class="file-link" v-for="doc in item.attinfos" :key="doc.index" :href="doc.url">{{doc.document}}</a>
           </div>
         </div>
       </div>

src/SDrpManagement/Products/modules/list.vue

@@ -102,14 +102,14 @@ export default {
       this.listData()
     },
     async insertToShopCart (item) {
-      console.log(item)
       const res = await this.$api.requested({
         "id": 20220924095102,
         "content": {
           "sa_brandid": this.params.content.brandids[0], //品牌id
           "itemid": item.itemid, //货品id
           "qty": item.orderminqty, //数量
-          "itemno": item.itemno //货品编号
+          "itemno": item.itemno, //货品编号
+          "tradefield":this.params.content.tradefield
         }
       })
       this.$notify({

src/SDrpManagement/shopCart/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
-    <list ref="list" @selection="selection" @qtyChange="qtyChange">
+    <list ref="list" @selection="selection" @onRadioChange="onRadioChange" @qtyChange="qtyChange">
       <template v-slot:del="scope">
         <on-del :data="scope.data" @onSuccess="onSuccess"></on-del>
       </template>
     </list>
-    <total ref="total" :data="selectedProduct" @onSuccess="onSuccess"></total>
+    <total ref="total" :data="selectedProduct" :istool="istool" @onSuccess="onSuccess"></total>
   </div>
 </template>
 
@@ -21,7 +21,9 @@ export default {
   },
   data () {
     return {
-      selectedProduct:[]
+      selectedProduct:[],
+      activeName:'first',
+      istool:''
     }
   },
   methods:{
@@ -34,6 +36,9 @@ export default {
     },
     qtyChange () {
       this.$refs['total'].totalPrice(this.selectedProduct)
+    },
+    onRadioChange (istool) {
+      this.istool = istool
     }
   }
 }

src/SDrpManagement/shopCart/modules/confirmOrder.vue

@@ -244,7 +244,7 @@
 import previewImage from '@/components/previewImage/index.vue'
 
 export default {
-  props:['data','total'],
+  props:['data','total','istool'],
   components:{
     previewImage
   },
@@ -342,6 +342,7 @@ export default {
       const res = await this.$api.requested({
         "id": 20221128183202,
         "content": {
+          "istool":this.istool,
           "sa_accountclassid": this.accountlist[this.defaultData.account_index].sa_accountclassid, //营销账户类型ID
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
           "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID

src/SDrpManagement/shopCart/modules/list.vue

@@ -1,10 +1,14 @@
 <template>
-<div class="container normal-panel"> 
-  <div class="flex-align-center flex-between normal-margin">
-    <slot name="operation"></slot>
+<div class="container normal-panel">
+  <div class="normal-margin">
+    <!-- <slot name="operation"></slot> -->
     <div class="flex-align-center">
-      <el-input size="small" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
-      <slot name="add"></slot>
+      <el-radio-group class="inline-16" size="small" v-model="params.content.istool" @change="onRadioChange">
+        <el-radio-button :label="0">产品</el-radio-button>
+        <el-radio-button :label="1">工具</el-radio-button>
+      </el-radio-group>
+      <el-input style="width:300px" size="small" v-model="params.content.where.condition" placeholder="产品名称,编号" @keyup.enter.native="listData(params.content.pageNumber = 1)" @clear="listData(params.content.pageNumber = 1)" clearable></el-input>&nbsp;
+      <!-- <slot name="add"></slot> -->
     </div>
   </div>
   <div class="produtMag-panel">
@@ -116,6 +120,7 @@ export default {
         "content": {
           "pageNumber": 1,
           "pageSize": 20,
+          "istool":0,
           "where": {
             "condition": ''
           }
@@ -164,6 +169,11 @@ export default {
     },
     qtyChange () {
       this.$emit('qtyChange')
+    },
+    onRadioChange () {
+      this.params.content.pageNumber = 1
+      this.listData()
+      this.$emit('onRadioChange',this.params.content.istool)
     }
   },
   mounted () {

src/SDrpManagement/shopCart/modules/total.vue

@@ -1,6 +1,6 @@
 <template>
 <div>
-  <confirmOrder :data="data" :total="total" ref="conf"></confirmOrder>
+  <confirmOrder :istool="istool" :data="data" :total="total" ref="conf"></confirmOrder>
   <div class="total-panel normal-panel flex-align-center flex-between">
     <p class="text-grey" @click="deleSelectProd">删除选中商品</p>
     <div class="flex-align-center">
@@ -17,7 +17,7 @@
 <script>
 import confirmOrder from './confirmOrder.vue'
 export default {
-  props:['data'],
+  props:['data','istool'],
   data () {
     return {
       total:0

src/SDrpManagement/sinvoiceapp/modules/add.vue

@@ -98,7 +98,6 @@ import invoiceCanUseTax from '@/template/invoiceCanUseTax/index.vue'
 export default {
   data () {
     var checktaxno = (rule, value, callback) => {
-      if (this.form.enterprisename === '') return callback(new Error('请先选择经销商'));
       if (!value) {
         return callback(new Error('请选择税号'));
       }
@@ -118,9 +117,6 @@ export default {
       },
       value:'',
       rules:{
-        enterprisename: [
-          { required: true, message: '请选择经销商', trigger: 'change' },
-        ],
         taxno: [
           { validator: checktaxno,trigger: 'change' }
         ],

src/api/api.js

@@ -8,7 +8,6 @@ import http from './http'
 // let resquest = "/apis"
 
 let resquest = process.env.NODE_ENV === 'production' ? '':'/apis'
-
 export default {
     loginCode(params) {
         return http.post(`${resquest}/yos/rest/index/getpassword`, params)

src/components/normal-basic-layout/details/index.vue

@@ -185,7 +185,7 @@ export default {
       this.$refs.tag.queryTag()
     },
     closeTags() {
-      this.$refs.tag.closeTag()
+      this.$refs.tag?this.$refs.tag.closeTag():''
     }
   },
   mounted () {

src/components/normal-basic-layout/details/modules/datalog/index.vue

@@ -18,7 +18,7 @@
 
 <script>
 export default {
-  props:['ownertable'],
+  props:['ownertable','editData','idname'],
   data () {
     return {
       list:[]
@@ -32,7 +32,7 @@ export default {
           "pageNumber": 1,
           "pageSize": 100,
           "ownertable":this.ownertable,
-          "ownerid":this.$route.query.id
+          "ownerid":this.$route.query.id?this.$route.query.id:this.editData[this.idname]
         }
       })
       this.list = res.data

src/components/normal-basic-layout/details/modules/tabs/tab.vue

@@ -12,14 +12,14 @@
       <slot v-if="'tab'+index === activeName"  :name="'slot' + index"></slot>
     </div>
     <div v-show="activeName === 'file'">
-      <attachmentList :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
+      <attachmentList v-if="activeName === 'file'" :attinfos="attinfo_attachment" @onSuccess="queryAttments" @cancelEdit="queryAttments">
         <upload slot="upload" :folderid="folderid"
           :bindData="{ ownertable: ownertable, ownerid: editData[idname], usetype: 'default' }"
           @onSuccess="queryAttments"></upload>
       </attachmentList>
     </div>
     <div v-show="activeName === 'log'">
-      <datalog :ownertable="ownertable"></datalog>
+      <datalog v-if="activeName === 'log'" :editData="editData" :idname="idname" :ownertable="ownertable"></datalog>
     </div>
   </div>
 </template>
@@ -45,6 +45,7 @@ export default {
   },
   methods:{
     async queryAttments () {
+      console.log(this.editData,'---')
       const res = await this.$api.requested({
         "classname": "system.attachment.Attachment",
         "method": "queryFileLink",

src/components/normal-basic-layout/index.vue

@@ -34,7 +34,7 @@
         </div>
         <div class="flex-align-stretch" style="min-width:800px">
           <slot name="custom"></slot>
-          <el-input v-if="!hideSearch" 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 v-if="!hideSearch" 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="clearSearchValue" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
       </div>
@@ -278,12 +278,17 @@ export default {
       this.tool.showMessage(res,() => {
         window.open(this.$baseUrl + res.data)  
       })
+    },
+    clearSearchValue () {
+      this.$store.dispatch('clearSearchValue')
+      this.listData(this.param.content.pageNumber = 1)
     }
   },
   watch:{
   },
   mounted () {
     this.autoQuery === false?'':this.listData()
+    console.log(process.env)
   },
   created () {
     this.$emit('listCreate',this.param)

src/router/HDrpManagement.js

@@ -30,6 +30,27 @@ const HDrpManagement = [
       },
     ]
   },
+  {
+    path: '/rebatesettlement',
+    name: 'rebatesettlement',
+    meta: {
+      title: '居间费结算单',
+      ast_nav: true,
+      keeproute: true,
+    },
+    component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/rebatesettlement/index'),
+    children:[
+      {
+        path: '/rebatesettlement_detail',
+        name: 'rebatesettlement',
+        meta: {
+          title: '居间费结算单',
+          ast_nav: true,
+        },
+        component: () => import(/* webpackChunkName: "about" */ '@/HDrpManagement/rebatesettlement/details/index'),
+      },
+    ]
+  },
   {
     path: '/dispatch',
     name: 'dispatch',

src/store/index.js

@@ -109,6 +109,9 @@ export default new Vuex.Store({
       } else {
         state.closeDrawerTemp = false
       }
+    },
+    clearSearchValue (state) {
+      state.searchValue = ''
     }
   },
   actions: {
@@ -277,7 +280,12 @@ export default new Vuex.Store({
     // 历史路由删除后返回上一页操作
     detailDeleteRouterBack ({commit},route) {
       commit('detailDeleteRouterBack',route)
-    }
+    },
+
+    clearSearchValue ({commit},data) {
+      commit('clearSearchValue')
+    },
+
   },
   modules: {
   },