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

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

@@ -45,7 +45,7 @@
           label="原数量"
           width="180">
           <template slot-scope="scope">
-            <span>{{scope.row.undeliqty}}</span>
+            <span>{{scope.row.qty}}</span>
           </template>
         </el-table-column>
         <el-table-column

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

@@ -234,12 +234,12 @@
           label="仓库"
           width="150">
           <template slot-scope="scope">
-            <el-select v-model="scope.row.stockid" size="mini" @visible-change="queryStock(scope.row)" placeholder="请选择">
+            <el-select v-model="scope.row.stockno" size="mini" @visible-change="queryStock(scope.row)" placeholder="请选择">
               <el-option
                 v-for="item in stockOptions"
-                :key="item.stockno"
+                :key="item.WAREHOUSE"
                 :label="item.WAREHOUSE"
-                :value="item.stockno"
+                :value="item.WAREHOUSE"
                 @click.native="stockChange(item,scope.row,scope.$index)">
                 <span>{{ item.WAREHOUSE }}</span>
                 <div style="float: right; color: #8492a6; font-size: 13px">数量:{{item.qty}}仓位:{{ item.LOCATION }}/批号:{{ item.LOT }}</div>
@@ -396,6 +396,7 @@ export default {
       })
     },
     stockChange (item,row,index) {
+      row.stockno = item.WAREHOUSE
       row.position = item.LOCATION
       row.batchno = item.LOT
       this.$set(this.tableData,index,row)
@@ -519,7 +520,6 @@ export default {
       })
     },
     async queryStock (val) {
-      console.log(val)
       const res = await this.$api.requested({
         "id": 20230228193201,
         "content": {

src/HDrpManagement/orderManage/modules/edit.vue

@@ -333,7 +333,7 @@ export default {
         "id": 20230218225002,
         "content": {
           "sa_orderid": this.data.sa_orderid, //订单金额
-          "isused": this.data.rebate_used == 1 ? 0 : 1, //是否使用
+          "isused": this.checked, //是否使用
           "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
         }
       })

src/HManagement/accountManage/modules/account_detail.vue

@@ -11,26 +11,15 @@
       idname="userid"
       ownertable="sys_users"
       tags=""
-      :tabs="['员工信息','角色信息']"
+      :tabs="[this.mainData.usertype === 1 || this.mainData.usertype === 0 ? '人员信息' : '基本信息','角色信息']"
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" >
         <useTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></useTemp>
         <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>
       </div>
-      <div class="container normal-panel" slot="slot0" >
-        <el-descriptions :column="4">
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="编号">{{mainData.hrmsg.hrcode?mainData.hrmsg.hrcode:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="身份证号">{{mainData.hrmsg.idcard?mainData.hrmsg.idcard:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门">{{mainData.hrmsg.depname?mainData.hrmsg.depname:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="部门负责人">{{mainData.hrmsg.isleader === 1?'是':'否'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="职位">{{mainData.hrmsg.position?mainData.hrmsg.position:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="办公电话">{{mainData.hrmsg.officetelephone?mainData.hrmsg.officetelephone:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="姓名">{{mainData.hrmsg.name?mainData.hrmsg.name:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="电话">{{mainData.hrmsg.phonenumber?mainData.hrmsg.phonenumber:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="性别">{{mainData.hrmsg.sex?mainData.hrmsg.sex:'--'}}</el-descriptions-item>
-          <el-descriptions-item label-class-name="my-label" content-class-name="my-content" label="电子邮箱">{{mainData.hrmsg.email?mainData.hrmsg.email:'--'}}</el-descriptions-item>
-        </el-descriptions>
+      <div slot="slot0" >
+        <detailInfo :more="true" :data="detailInfo"></detailInfo>
       </div>
       <div class="container normal-panel" slot="slot1" >
         <tableLayout :layout="table_roleinfo" :data="roleData" :opwidth="200" :custom="false">
@@ -46,6 +35,8 @@
 <script>
 import unuseTemp from './unuseAccount.vue'
 import useTemp from './useAccdount.vue'
+
+import detailInfo from '@/components/detailInfo/index'
 export default {
   name: "detail",
   data() {
@@ -57,12 +48,15 @@ export default {
       table_roleinfo:[],
       list:[],
       hrmsg:[],
-      roleData:[]
+      roleData:[],
+      accountInfo:{},
+      detailInfo:[]
     }
   },
   components:{
     unuseTemp,
-    useTemp
+    useTemp,
+    detailInfo
   },
   methods:{
     async queryMainData(id) {
@@ -90,6 +84,89 @@ export default {
       // 插入角色数据
       this.roleData = res.data.userrole
       this.changeDataStructure()
+
+      this.getAccountInfo()
+    },
+    /* 获取企业员工信息 || 合作商/合作商员工信息 */
+    async getAccountInfo () {
+      let res
+      if (this.mainData.usertype === 1 || this.mainData.usertype === 0) {
+        res = await this.$api.requested({
+          "classname":"webmanage.hr.hr",
+          "method": "query_hrMain",
+          "content": {
+            hrid:this.mainData.hrmsg.hrid
+          }
+        })
+        this.accountInfo = res.data
+        console.log('企业员工',this.accountInfo);
+        
+      } else {
+        res = await this.$api.requested({
+          "classname":"webmanage.sale.agents.agents",
+          "method": "query_agentMain",
+          "content": {
+            sa_agentsid:this.mainData.agentmsg.sa_agentsid
+          }
+        })
+        this.accountInfo = res.data
+        console.log('合作商',this.accountInfo);
+      }
+
+      this.detailInfo = this.mainData.usertype === 1 || this.mainData.usertype === 0 
+      ? 
+        [{
+          title:'基本信息',
+          info: [
+            {label:'登录账号',value:this.accountInfo.accountno},
+            {label:'账号名称',value:this.accountInfo.username},
+            {label:'账号类型',value:this.accountInfo.usertypename},
+            {label:'授权角色',value:this.accountInfo.userrole},
+            {label:'电话',value:this.accountInfo.accountno !== ''?this.accountInfo.userphonenumber:this.accountInfo.phonenumber},
+            {label:'办公电话',value:this.accountInfo.officetelephone},
+            {label:'部门',value:this.accountInfo.depname},
+            {label:'职位',value:this.accountInfo.position},
+            {label:'是否部门负责人',value:this.accountInfo.isleader === 1?'是':'否'},
+            {label:'电子邮箱',value:this.accountInfo.email},
+            {label:'汇报对象',value:this.accountInfo.reporthrname},
+            {label:'身份证号',value:this.accountInfo.idcard},
+            {label:'性别',value:this.accountInfo.sex},
+            {label:'是否服务人员',value:this.accountInfo.isworker === 1?'是':'否'},
+          ]
+        },{
+          title:'系统信息',
+          info: [
+            {label:'创建人',value:this.accountInfo.createby},
+            {label:'创建时间',value:this.accountInfo.createdate},
+            {label:'提交人',value:this.accountInfo.submitby},
+            {label:'提交时间',value:this.accountInfo.submitdate},
+          ]
+        }]
+      :
+        [{
+          title:'基本信息',
+          info: [
+            {label:'经销商编号',value:this.accountInfo.agentnum},
+            {label:'erp编号',value:this.accountInfo.erpagentnum},
+            {label:'是否服务经销商',value:this.accountInfo.isservice?'是':'否'},
+            {label:'状态',value:this.accountInfo.status},
+            {label:'签约日期',value:this.accountInfo.signdate},
+            {label:'经销商类型',value:this.accountInfo.type},
+            {label:'上级经销商',value:this.accountInfo.parent_enterprisename},
+            {label:'经销商等级',value:this.accountInfo.grade},
+            {label:'省市县',value:`${this.accountInfo.province}-${this.accountInfo.city}-${this.accountInfo.county}`},
+            {label:'详细地址',value:this.accountInfo.address},
+            {label:'企业联系人',value:this.accountInfo.contact},
+            {label:'联系电话',value:this.accountInfo.phonenumber},
+            {label:'税号',value:this.accountInfo.taxno},
+            {label:'免运费金额',value:this.accountInfo.freefreightamount},
+            {label:'订单可退货天数',value:this.accountInfo.limitreturnday},
+            {label:'是否订单审核可开票',value:this.accountInfo.invoicingpoint == '1' ? '订单审核' : '发货'},
+            {label:'是否授权所有营销类别',value:this.accountInfo.saleclassauth ? '否' : '是'},
+            {label:'创建人',value:this.accountInfo.createby},
+            {label:'创建时间',value:this.accountInfo.createdate},
+          ]
+        }]
     },
     changeDataStructure() {
       this.mainAreaData = [

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -41,8 +41,8 @@
             <p><small>本单金额:&nbsp;</small>{{data.rebate_used ? tool.formatAmount(data.defaultamount - rebateamount,2) : data.defaultamount}}</p>
           </div>
           <div v-if="(data.type === '标准订单' ||  data.type === '特殊订单') && isusedrebate === 1">
-            <el-checkbox v-model="data.rebate_used" :true-label="1" :false-label="0" @change="rebateUsedChange">使用返利金</el-checkbox>
-            <div v-if="data.rebate_used" class="flex-align-center">
+            <el-checkbox v-model="checked" :true-label="1" :false-label="0" @change="rebateUsedChange">使用返利金</el-checkbox>
+            <div v-if="checked" class="flex-align-center">
               <p class="inline-16"><b>返利金余额:{{tool.formatAmount(data.rebatebalance,2)}}</b></p>
               <el-input class="inline-16" size="mini" style="width:150px" v-model="data.rebateamount" @blur="useRebate(data.rebateamount)" placeholder="输入使用金额"></el-input>
               <small>(返利金最高使用比例{{data.order_rebate_userate}})</small>
@@ -121,7 +121,7 @@
                   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;
+                  @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
@@ -416,9 +416,9 @@ export default {
     },
     async useRebate (e) {
       let that = this
-      /* 修改返利金 */
-        let rebateamount = e;
-        let amount = this.data.order_rebate_userate * this.data.defaultamount;//最大可用金额
+      /* 修改返利金 */
+      let rebateamount = e;
+      let amount = this.data.order_rebate_userate * this.data.defaultamount;//最大可用金额
       const res = await this.$api.requested({
               "id":20230218225002,
               "content":{
@@ -471,23 +471,18 @@ export default {
     },
     async rebateUsedChange(){
       console.log(this.data)
-
-
-      if(this.data.status != '新建') return 1
-
-
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
-      let rebatebalance = this.data.rebatebalance; //返利金账户余额
+      if(this.data.status != '新建') return 1
+      let amount=this.data.order_rebate_userate*this.data.defaultamount;//最大可用金额
+      let rebatebalance = this.data.rebatebalance;//返利金账户余额
       const res = await this.$api.requested({
-        "id": 20230218225002,
-        "content": {
-          "sa_orderid": this.data.sa_orderid, //订单金额
-          "isused": this.data.rebate_used == 1 ? 0 : 1, //是否使用
-          "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
+        "id": 20230218225002,
+        "content": {
+          "sa_orderid": this.data.sa_orderid,//订单金额
+          "isused": this.checked,//是否使用
+          "rebateamount":rebatebalance > amount ? amount : rebatebalance//返利金使用金额
         }
       })
-      console.log(res)
-      this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
+      // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
 
     }
   },

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -111,7 +111,7 @@
                   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;
+                  @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
@@ -298,19 +298,19 @@ export default {
     },
     async rebateUsedChange(){
       console.log(this.data)
-      if(this.data.status != '新建') return 1
-      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
-      let rebatebalance = this.data.rebatebalance; //返利金账户余额
+      if(this.data.status != '新建') return 1
+      let amount = this.data.order_rebate_userate * this.data.defaultamount; //最大可用金额
+      let rebatebalance = this.data.rebatebalance; //返利金账户余额
       const res = await this.$api.requested({
-        "id": 20230218225002,
-        "content": {
-          "sa_orderid": this.data.sa_orderid, //订单金额
-          "isused": this.data.rebate_used == 1 ? 0 : 1, //是否使用
-          "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
+        "id": 20230218225002,
+        "content": {
+          "sa_orderid": this.data.sa_orderid, //订单金额
+          "isused": this.checked, //是否使用
+          "rebateamount": rebatebalance > amount ? amount : rebatebalance //返利金使用金额
         }
       })
       console.log(res)
-      this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
+      // this.data.rebate_used = res.msg !== '成功' ? this.data.rebate_used == 0?1:0:this.data.rebate_used
     },
     onShow () {
       this.initPage()
@@ -420,17 +420,17 @@ export default {
     },
     async useRebate (e) {
       let that = this
-      /* 修改返利金 */
+      /* 修改返利金 */
       let rebateamount = e;
       let amount = this.data.order_rebate_userate * this.data.defaultamount;//最大可用金额
       const res = await this.$api.requested({
-              "id":20230218225002,
-              "content":{
-                "sa_orderid":this.data.sa_orderid,//订单金额
-                "isused":1,//是否使用
-                "rebateamount":rebateamount>amount?amount:rebateamount
-              }
-            })
+        "id":20230218225002,
+        "content":{
+          "sa_orderid":this.data.sa_orderid,//订单金额
+          "isused":1,//是否使用
+          "rebateamount":rebateamount>amount?amount:rebateamount
+          }
+        })
       if(res.data=='成功'){
         this.$emit('onSuccess')
         this.initPage()

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -266,6 +266,7 @@ export default {
   },
   computed:{
     canUseInput () {
+      if (this.data.saler.length === 0) return false
       let salerIsEditPrice = this.data.saler[0].iseditprice
       if (this.data.type === '标准订单' && salerIsEditPrice && this.data.status === '新建') {
         return true