暂存

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/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

@@ -172,6 +172,15 @@
             </el-option>
           </el-select>
         </div>
+        <div style="margin-left:20px">
+          <small><b>单据日期:</b>&nbsp;</small>
+          <el-date-picker
+            v-model="billdate"
+            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 +254,8 @@ export default {
       isusedrebate:0,
       signbackstatus:'不需要',
       saletype:"",
-      saler_name:""
+      saler_name:"",
+      billdate:''
     }
   },
   methods:{
@@ -290,6 +300,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 +308,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
       })
     },

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/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/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/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