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

src/App.vue

@@ -14,6 +14,7 @@
     computed:{
     ...mapGetters({
       searchValue:'searchValue',
+      isRouterAlive:'isRouterAlive'
     })
   },
     methods:{

src/Form/recvoucher/add.vue

@@ -12,8 +12,8 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="经销商:" prop="enterprisename">
-                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                <el-input v-model="form.enterprisename"  placeholder="选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" >

src/Form/recvoucher/edit.vue

@@ -12,8 +12,8 @@
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
             <el-col :span="12">
-              <el-form-item label="经销商:" prop="enterprisename">
-                <el-input v-model="form.enterprisename"  placeholder="请选择经销商" @focus="enterpriseList"></el-input>
+              <el-form-item label="选择企业:" prop="enterprisename">
+                <el-input v-model="form.enterprisename"  placeholder="选择企业" @focus="enterpriseList"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12" >

src/HDrpManagement/BrandManage/component/saleclass/components/edit.vue

@@ -21,7 +21,7 @@
           <el-input v-model="ruleForm.itemclassnum" :disabled="type!='add'" size="small" placeholder="请输入营销类别编号"></el-input>
         </el-form-item>
         <el-form-item>
-          <el-checkbox v-model="ruleForm.istool" :true-label="1" :false-label="0">是否工具</el-checkbox>
+          <el-checkbox :disabled="type == 'add'" v-model="ruleForm.istool" :true-label="1" :false-label="0">是否工具</el-checkbox>
           <el-checkbox v-model="ruleForm.ishide" :true-label="1" :false-label="0">是否隐藏</el-checkbox>
         </el-form-item>
       </el-form>
@@ -84,7 +84,7 @@ export default {
             "content": {
                 "itemclassid":this.type == 'add' ? 0 : this.rowData.itemclassid,     
                 "sa_brandid":this.rowData.sa_brandid,
-                "parentid":this.rowData.itemclassid === undefined ? 0 : this.rowData.itemclassid,
+                "parentid":this.type == 'add' ? this.rowData.itemclassid : 0,
                 "itemclassnum":this.ruleForm.itemclassnum,
                 "itemclassname":this.ruleForm.itemclassname,
                 "istool":this.ruleForm.istool,

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -12,7 +12,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="品牌:" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])" style="width: 100%">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" style="width: 100%">
                   <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
                              :value="item.sa_brandid" size="small">
                   </el-option>
@@ -22,7 +22,7 @@
             <el-col :span="8">
               <el-form-item label="默认商品:" prop="sequence">
                 <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
-                  <el-input readonly type="text" slot="input" size="small" @focus="$refs.product.visible=true" v-model="form.itemname"></el-input>
+                  <el-input v-model="form.itemname" :disabled="tableData.length == 0" readonly type="text" slot="input" size="small" @focus="$refs.product.tableData=tableData,$refs.product.visible=true"></el-input>
                 </selectProduct>
               </el-form-item>
             </el-col>
@@ -68,8 +68,10 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemname:'',
         tag: [],
-        sequence:''
+        sequence:'',
+        sa_itemgroupid:0,
       },
       rules: {
         sa_brandid: [
@@ -94,6 +96,7 @@ export default {
         sa_brandid: '',
         groupname: '',
         itemno: '',
+        itemname:'',
         tag: []
       },
       this.tableData = []
@@ -107,6 +110,10 @@ export default {
       this.tableData = this.tableData.filter(e=>{
         return e.itemid !== row.itemid
       })
+      if (this.tableData.findIndex(item => item.itemno == this.form.itemno) == -1) {
+        this.form.itemno = ''
+        this.form.itemname = ''
+      }
     },
     async submit() {
       if (this.tableData.length === 0) 
@@ -116,20 +123,19 @@ export default {
         })
       const res = await this.$api.requested({
         "id": "20220922164303",
-        "content": {
-          "sa_itemgroupid":0,     //sa_itemgroupid<=0时 为新增
-          "sa_brandid":this.form.sa_brandid,
-          "groupname":this.form.groupname,
-          "itemno":"",
-          "sequence":this.form.sequence,
-          "tag": []
-        }
+        "content": this.form
       })
       this.tool.showMessage(res,()=>{
         this.groupdata = res.data
         this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
       })
     },
+    productChange (data) {
+      this.form.itemno = data.itemno
+      this.form.itemname = data.itemname
+      this.$refs.product.visible = false
+      
+    },
     async onSuccess () {
       const res = await this.$api.requested({
         "id": "20220922164303",

src/HDrpManagement/contractManage/components/productClassList/addProduct.vue

@@ -118,6 +118,39 @@ export default {
       console.log(this.productList);
       
     },
+    createTreeData (array) {
+      var that = this
+      let arr = []
+      function convertToElementTree(node) {
+        // 新节点
+        var elNode = {
+          num:node['num'],
+          itemclassfullname:node['itemclassfullname'],
+          itemclassname: node["itemclassname"],
+          parentid:node['parentid'],
+          itemclassid:node['itemclassid'],
+          itemclassnum:node['itemclassnum'],
+          sa_brandid:that.data.sa_brandid,
+          ishide:node['ishide'],
+          isdeep:node['isdeep'],
+          istool:node['istool'],
+          children: []
+        }
+          
+        if (node.subdep && node.subdep.length > 0) {
+          // 如果存在子节点
+          for (var index = 0; index < node.subdep.length; index++) {
+          // 遍历子节点, 把每个子节点看做一颗独立的树, 传入递归构造子树, 并把结果放回到新node的children中
+          elNode.children.push(convertToElementTree(node.subdep[index]));
+          }
+        }
+        return elNode;
+      }
+      array.forEach((element) => {
+        arr.push(convertToElementTree(element))
+      });
+      return arr
+    },
     async addProduct (data) {
       let res = await this.$api.requested({
         "id": 20221124110202,

src/HDrpManagement/dispatch/details/index.vue

@@ -55,7 +55,7 @@ import { log } from '@antv/g2plot/lib/utils'
             "sa_dispatchid":this.$route.query.id
           }
         })
-        this.mainData = res.data.recvice
+        this.mainData = res.data
         console.log(this.mainData)
         this.changeDataStructure()
       },

src/HDrpManagement/logistics/details/index.vue

@@ -16,9 +16,14 @@
         <div slot="tags">
         </div>
         <div slot="customOperation" >
+<<<<<<< HEAD
+          <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>
+=======
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <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>
+>>>>>>> f9c8967a8aa0821b6d96a17a6ea9db06adb24d7d
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>
@@ -105,12 +110,15 @@
             label:'运费',
             value:this.mainData.freightamount
           },
+          {
+            label:'收货人',
+            value:this.mainData.name
+          },
           {
             label:'寄件方式',
             value:this.mainData.paytype
           },
           
-
           {
             label:'状态',
             value:this.mainData.status,

src/HDrpManagement/orderManage/details/index.vue

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

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

@@ -19,7 +19,7 @@
       <div slot="title" class="my-label__title">收货信息</div>
       <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province}${mainData.contacts.city}${mainData.contacts.county}${mainData.contacts.address}`:'--'}}</el-descriptions-item>
+      <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>

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

@@ -139,6 +139,13 @@
           <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
         </template>
       </el-table-column>
+      <el-table-column
+        label="折后价格"
+        prop="totalprice">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+        </template>
+      </el-table-column>
       <el-table-column
         label="小计"
         prop="totalprice">

src/HDrpManagement/orderManage/modules/add.vue

@@ -204,7 +204,7 @@ export default {
       this.$refs['form'].validate(async valid => {
         if (!valid) return
         const res = await this.$api.requested({
-          "id": 20221108111402,
+          "id":this.form.type ==='项目订单'?20230103141402: 20221108111402,
           "content":this.form
         })
         this.tool.showMessage(res,()=>{

src/HDrpManagement/orderManage/modules/edit.vue

@@ -163,7 +163,7 @@
         </div>
         <div style="margin-left:20px">
           <small><b>销售类别:</b>&nbsp;</small>
-          <el-select v-model="saletype" size="mini" placeholder="请选择">
+          <el-select v-model="saletype" size="small" placeholder="请选择">
             <el-option
               v-for="item in saleroptions"
               :key="item.value"
@@ -172,6 +172,16 @@
             </el-option>
           </el-select>
         </div>
+        <div style="margin-left:20px">
+          <small><b>单据日期:</b>&nbsp;</small>
+          <el-date-picker
+            v-model="billdate"
+            size="small"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </div>
       </div>
       <div class="normal-margin">
         <p class="normal-title mt-10 inline-16">订单备注</p>
@@ -245,7 +255,8 @@ export default {
       isusedrebate:0,
       signbackstatus:'不需要',
       saletype:"",
-      saler_name:""
+      saler_name:"",
+      billdate:''
     }
   },
   methods:{
@@ -290,6 +301,7 @@ export default {
       this.saletype = this.data.saletype
       this.signbackstatus = this.data.signbackstatus
       this.saler_name = this.data.saler_name
+      this.billdate = this.data.billdate
     },
    
     async onSubmit() {
@@ -297,27 +309,32 @@ export default {
         "id": 20221108111402,
         "content": {
           "sa_orderid": this.$route.query.id,
-          "sys_enterpriseid": this.defaultData.sys_enterpriseid, //订货企业id
+          "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
           "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
           "sa_brandid": this.data.sa_brandid, //品牌ID
-          // "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
-          // "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
+          "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
+          "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
           "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "type": this.data.type, //订单类型
           "typemx":this.data.typemx, //明细分类，可选
           "remarks": this.defaultData.remarks, //可选
-          // "saler_hrid":this.data.saler_hrid//销售人员hrid,业务员hrid
+          "saler_hrid":this.data.saler_hrid,//销售人员hrid,业务员hrid
           "signbackstatus":this.signbackstatus,
+          "tradefieldmx":this.data.tradefieldmx,
           "pay_enterpriseid":this.data.pay_enterpriseid,
           "tradefield":this.data.tradefield,
           "saletype":this.saletype,
+          "rebate_used":this.checked,//默认0，是否使用返利金
+          "signbacknum":'',
+          "sa_promotionid":this.data.sa_promotionid,
+          "billdate":this.billdate
         },
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        this.useRebate()
+        this.isusedrebate === 1?this.useRebate():""
         this.drawer = false
       })
     },
@@ -348,7 +365,7 @@ export default {
       this.tool.showMessage(res,()=>{
         this.setcol = 24
         this.$refs['prolist'].listData()
-        this.$emit('onSuccess')
+        // this.$emit('onSuccess')
       })
     },
     async useRebate () {

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -12,21 +12,31 @@
       </div>
     </div>
     <div class="drawer__panel">
-      <div v-if="data.sa_contractid" class="normal-margin">
-        <p class="normal-title mt-10">合同信息</p>
-        <div class="reveive__panel">
-          <p>{{data.contract_title}}</p>
+      <div class="flex-align-center">
+        <div v-if="data.sa_contractid" class="normal-margin">
+          <p class="normal-title mt-10">合同信息</p>
+          <div class="reveive__panel">
+            <p>{{data.contract_title}}</p>
+          </div>
+        </div>
+        <div class="normal-margin">
+          <p class="normal-title mt-10">单据日期</p>
+          <div class="reveive__panel">
+            <el-date-picker
+              v-model="defaultData.billdate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+              size="mini">
+            </el-date-picker>
+          </div>
+        </div>
+        <div v-if="data.sa_contractid" class="normal-margin">
+          <p class="normal-title mt-10">购买套数</p>
+          <div class="reveive__panel">
+            <el-input-number v-model="defaultData.toolcount" size="mini" label="购买套数"></el-input-number>
+          </div>
         </div>
-      </div>
-      <div class="normal-margin">
-        <p class="normal-title mt-10">单据日期</p>
-        <el-date-picker
-          v-model="defaultData.billdate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期"
-          size="mini">
-        </el-date-picker>
       </div>
       <div class="flex-align-center normal-margin">
         <div style="flex:1;margin-right:10px">
@@ -69,12 +79,12 @@
               <el-button slot="reference" type="text" size="mini">选择其他地址</el-button>
             </el-popover>
           </div>
-          <div class="reveive__panel normal-margin">
+          <div class="reveive__panel">
             <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
             <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
-        <div style="flex:1">
+        <!-- <div style="flex:1">
           <div class="mt-10">
             <p class="normal-title inline-16">选择账户</p>
             <el-popover
@@ -114,7 +124,7 @@
             <p><b>¥{{tool.formatAmount(defaultData.accountclass.balance,2)}}</b></p>
             <small>{{defaultData.accountclass.accountname}}</small>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="mt-10">
         <p class="normal-title inline-16">选择财务信息</p>
@@ -178,10 +188,6 @@
       <div class="mt-10">
         <el-input v-model="defaultData.remarks" type="textarea" :autosize="{minRows:5,maxRows:10}" placeholder="请输入订单备注"></el-input>
       </div>
-      <div v-if="data.sa_contractid" class="normal-margin">
-        <p class="normal-title mt-10">购买套数</p>
-        <el-input-number v-model="defaultData.toolcount" label="购买套数"></el-input-number>
-      </div>
       <div>
         <div class="mt-10">
           <p class="normal-title inline-16">订单产品</p>

src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -110,7 +110,6 @@ export default {
       
       this.dialogFormVisible = true
       this.form = Object.assign({},this.form,this.data)
-      this.form.remindmode = JSON.parse(this.data.remindmode)
     },
     onSubmit(){
       this.$refs['form'].validate(async (valid) => {

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -6,7 +6,7 @@
         <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li :class="brand_act === ''?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
+        <li :class="!brand_act?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
         <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
@@ -32,7 +32,7 @@ export default {
       itemclass:[],
       activeClass:{},
       field_act:'',
-      brand_act:'',
+      brand_act:0,
       class_act:''
     }
   },
@@ -71,18 +71,18 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = ''
+      this.brand_act = 0
     },
 
     async queryClass () {
       const res = await this.$api.requested({
-        "id":"20220922110403","content":{"sa_brandid":this.brand_act}
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:0}}
       })
       console.log(res.data,'pop')
       this.itemclass = res.data[0].ttemclass
     },
     clickBrand (id) {
-      this.brand_act = id
+      this.brand_act = id ? id : 0
       this.queryClass()
     },
     clickField (item) {

src/SDrpManagement/Products/modules/Select.vue

@@ -2,15 +2,15 @@
   <div class="border-bottom">
     <div>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">领域:</li>
-        <li :class="field_act === item.tradefield?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+        <li :class="field_act === ''?'act':''" class="brand-item" @click="clickField('')">全部领域</li>
+        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">品牌:</li>
+        <li :class="!brand_act?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
         <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">分类:</li>
+        <li :class="class_act === ''?'act':''" class="brand-item" @click="clickClass('')">全部分类</li>
         <li :class="class_act === item.itemclassnum?'act':''" class="brand-item" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
       <classTree style="padding-left:31px" :data="activeClass.subdep" @onClassChange="change"></classTree>
@@ -31,9 +31,9 @@ export default {
       fields:[],
       itemclass:[],
       activeClass:{},
-      field_act:0,
+      field_act:'',
       brand_act:0,
-      class_act:0
+      class_act:''
     }
   },
   props: {
@@ -57,9 +57,8 @@ export default {
             }
         }
       })
-      this.queryBrands()
       this.fields = res1.data
-      this.field_act = res1.data[0].tradefield
+      this.field_act = ''
     },
     async queryBrands () {
       const res = await this.$api.requested({
@@ -72,32 +71,34 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = this.brands[0].sa_brandid
-      this.queryClass()
+      this.brand_act = 0
     },
 
     async queryClass () {
       const res = await this.$api.requested({
-        "id":"20220922110403","content":{"sa_brandid":this.brand_act}
+        "id":"20220922110403","content":{"sa_brandid":this.brand_act,where:{istool:1}}
       })
-      if ( res.data.length > 0) {
-        this.itemclass =  res.data[0].ttemclass
-        res.data[0].ttemclass.length > 0?this.clickClass(res.data[0].ttemclass[0]):''
-      }
-
+      console.log(res.data,'pop')
+      this.itemclass = res.data[0].ttemclass
     },
     clickBrand (id) {
-      this.brand_act = id
+      this.brand_act = id ? id : 0
       this.queryClass()
     },
     clickField (item) {
-      this.field_act = item.tradefield
+      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
       this.$emit('clickField',item)
     },
     clickClass (item) {
-      this.activeClass = item
-      this.class_act = item.itemclassnum
-      this.change(item)
+      if (item) {
+        this.activeClass = item
+        this.class_act = item.itemclassnum
+        this.change(item)
+      } else {
+        this.class_act = ''
+        this.$emit('onClassChange',item)
+      }
+      
     },
     change(n) {
       console.log(n)
@@ -109,6 +110,7 @@ export default {
   },
   mounted () {
     this.queryAgentiInfo()
+    this.queryBrands()
   }
 }
 

src/SDrpManagement/agentOrder/details/tabs/defaultInfo.vue

@@ -19,7 +19,7 @@
       <div slot="title" class="my-label__title">收货信息</div>
       <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province}${mainData.contacts.city}${mainData.contacts.county}${mainData.contacts.address}`:'--'}}</el-descriptions-item>
+      <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>

src/SDrpManagement/agentOrder/modules/add.vue

@@ -165,7 +165,7 @@ export default {
       this.$refs['form'].validate(async valid => {
         if (!valid) return
         const res = await this.$api.requested({
-          "id": 20221108111402,
+          "id":this.form.type ==='项目订单'?20230103141402: 20221108111402,
           "content":this.form
         })
         this.tool.showMessage(res,()=>{

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -283,27 +283,32 @@ export default {
         "id": 20221108111402,
         "content": {
           "sa_orderid": this.$route.query.id,
-          "sys_enterpriseid": this.defaultData.sys_enterpriseid, //订货企业id
+          "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
           "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
           "sa_brandid": this.data.sa_brandid, //品牌ID
-          // "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
-          // "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
+          "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
+          "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
           "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "type": this.data.type, //订单类型
           "typemx":this.data.typemx, //明细分类，可选
           "remarks": this.defaultData.remarks, //可选
-          // "saler_hrid":this.data.saler_hrid//销售人员hrid,业务员hrid
+          "saler_hrid":this.data.saler_hrid,//销售人员hrid,业务员hrid
           "signbackstatus":this.signbackstatus,
+          "tradefieldmx":this.data.tradefieldmx,
           "pay_enterpriseid":this.data.pay_enterpriseid,
           "tradefield":this.data.tradefield,
           "saletype":this.saletype,
+          "rebate_used":this.checked,//默认0，是否使用返利金
+          "signbacknum":'',
+          "sa_promotionid":this.data.sa_promotionid,
+          "billdate":this.data.billdate
         },
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        this.useRebate()
+        this.isusedrebate === 1?this.useRebate():""
         this.drawer = false
       })
     },

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -97,6 +97,13 @@
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
         </template>
       </el-table-column>
+      <el-table-column
+        label="折后价格"
+        prop="totalprice">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+        </template>
+      </el-table-column>
       <el-table-column
         label="小计"
         width="150">

src/SDrpManagement/salerOrder/details/tabs/defaultInfo.vue

@@ -19,7 +19,7 @@
       <div slot="title" class="my-label__title">收货信息</div>
       <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
-      <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province}${mainData.contacts.city}${mainData.contacts.county}${mainData.contacts.address}`:'--'}}</el-descriptions-item>
+      <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>

src/SDrpManagement/salerOrder/modules/add.vue

@@ -200,11 +200,10 @@ export default {
      
     },
     submitForm() {
-      console.log(this.form)
       this.$refs['form'].validate(async valid => {
         if (!valid) return
         const res = await this.$api.requested({
-          "id": 20221108111402,
+          "id":this.form.type ==='项目订单'?20230103141402: 20221108111402,
           "content":this.form
         })
         this.tool.showMessage(res,()=>{

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -283,27 +283,32 @@ export default {
         "id": 20221108111402,
         "content": {
           "sa_orderid": this.$route.query.id,
-          "sys_enterpriseid": this.defaultData.sys_enterpriseid, //订货企业id
+          "sys_enterpriseid": this.data.sys_enterpriseid, //订货企业id
           "sa_accountclassid": this.defaultData.accountclass.sa_accountclassid, //营销账户类型ID
           "sa_brandid": this.data.sa_brandid, //品牌ID
-          // "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
-          // "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
+          "sa_contractid":this.data.sa_contractid, //合同ID，标准订单不传
+          "sa_projectid": this.data.sa_projectid, //工程项目表ID，标准订单不传
           "sys_enterprise_financeid": this.defaultData.fin_info.sys_enterprise_financeid, //合作企业财务信息ID（开票信息）
           "sa_logiscompid": this.defaultData.logist_info.sa_logiscompid, //物流公司档案ID
           "rec_contactsid": this.defaultData.re_info.contactsid, //合作企业联系人表ID（收货信息）
           "type": this.data.type, //订单类型
           "typemx":this.data.typemx, //明细分类，可选
           "remarks": this.defaultData.remarks, //可选
-          // "saler_hrid":this.data.saler_hrid//销售人员hrid,业务员hrid
+          "saler_hrid":this.data.saler_hrid,//销售人员hrid,业务员hrid
           "signbackstatus":this.signbackstatus,
+          "tradefieldmx":this.data.tradefieldmx,
           "pay_enterpriseid":this.data.pay_enterpriseid,
           "tradefield":this.data.tradefield,
           "saletype":this.saletype,
+          "rebate_used":this.checked,//默认0，是否使用返利金
+          "signbacknum":'',
+          "sa_promotionid":this.data.sa_promotionid,
+          "billdate":this.data.billdate
         },
       })
       this.tool.showMessage(res,()=>{
         this.$emit('onSuccess')
-        this.useRebate()
+        this.isusedrebate === 1?this.useRebate():""
         this.drawer = false
       })
     },

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -97,6 +97,13 @@
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
         </template>
       </el-table-column>
+      <el-table-column
+        label="折后价格"
+        prop="totalprice">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+        </template>
+      </el-table-column>
       <el-table-column
         label="小计"
         width="150">

src/components/newLayout/modules/header.vue

@@ -64,22 +64,22 @@ export default {
   },
   methods:{
     // 选择登录账号
-    selectAccount (item) {
+    async selectAccount (item) {
       let arr = ['module_info','activeApp','active_modules','folderid']
       arr.forEach(key=>{
         sessionStorage.removeItem(key)
       })
       sessionStorage.setItem('active_account',JSON.stringify(item))
-      this.basicData.query_userauth().then(()=>{
-        this.basicData.querySite_Parameter()
+      await this.basicData.query_userauth()
+      this.siteInfos()
+      this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))
+      this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
+        return e.siteid !== this.accountInfo.siteid
+      })
+      this.$nextTick(()=>{
         this.$router.go(0)
-        /*this.accountInfo = item*/
-        this.siteInfos()
-        this.accountInfo = JSON.parse(sessionStorage.getItem('active_account'))
-        this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
-          return e.siteid !== this.accountInfo.siteid
-        })
       })
+     
     },
     async getWeather () {
       const res = await axios.get(this.url)
@@ -138,6 +138,7 @@ export default {
     this.accountList = JSON.parse(sessionStorage.getItem('account_list')).filter(e=>{
       return e.siteid !== this.accountInfo.siteid
     })
+    this.basicData.querySite_Parameter()
   },
 }
 

src/store/index.js

@@ -46,6 +46,7 @@ export default new Vuex.Store({
     DrawerShow:state => state.DrawerShow,
     sys_modules:state => state.sys_modules,
     historyRouter:state => state.historyRouter,
+    isRouterAlive:state => state.isRouterAlive
     
   },
   mutations: {
@@ -112,7 +113,7 @@ export default new Vuex.Store({
     },
     clearSearchValue (state) {
       state.searchValue = ''
-    }
+    },
   },
   actions: {
     // 系统选项分类查询
@@ -284,7 +285,7 @@ export default new Vuex.Store({
 
     clearSearchValue ({commit},data) {
       commit('clearSearchValue')
-    },
+    }
 
   },
   modules: {

src/template/orderCanUseProduct/index.vue

@@ -104,6 +104,7 @@ export default {
           this.params.id = 20221109153502
           break;
         default:
+          this.params.id = 20221109153502
           break;
       } 
       this.params.content.sa_orderid = this.$route.query.id

src/template/selectProduct/index.vue

@@ -119,7 +119,6 @@ import uploadFile from '@/components/upload/hw_obs_upload'
 import previewImage from '@/components/previewImage/index'
 
 export default {
-  props:['productData'],
   data () {
     return {
       params:{
@@ -175,7 +174,7 @@ export default {
   mounted () {
   },
   created () {
-    if (this.productData) this.tableData = this.productData
+
   }
 }