jufubao-admin-library 1.1.169 → 1.1.170

package/library/viewModules/viewsEnterpriseBuy/schemas/enterprise_buy.js

@@ -10,13 +10,13 @@ module.exports = {
       mapFn: "purchaseMainOrder",
       isPublic: true,
       // #ifdef admin
-      path: '/wholesale-admin/v1/purchase-main-order',
+      path: '/wholesale-admin/v1/finance/purchase-sub-order',
       // #endif
       // #ifdef partner-wholesale
       path: '/wholesale-partner/v1/purchase-main-order',
       // #endif
       // #ifdef oa-finance
-      path: '/wholesale-partner/v1/finance/purchase-main-order',
+      path: '/wholesale-partner/v1/finance/purchase-sub-order',
       // #endif
       isRule: false,
       data: {
@@ -33,13 +33,13 @@ module.exports = {
       mapFn: "purchaseMainOrderInfo",
       isPublic: true,
       // #ifdef admin
-      path: '/wholesale-admin/v1/purchase-main-order/:purchase_main_order_id',
+      path: '/wholesale-admin/v1/finance/purchase-sub-order/:purchase_main_order_id',
       // #endif
       // #ifdef partner-wholesale
       path: '/wholesale-partner/v1/purchase-main-order/:purchase_main_order_id',
       // #endif
       // #ifdef oa-finance
-      path: '/wholesale-partner/v1/finance/purchase-main-order/:purchase_main_order_id',
+      path: '/wholesale-partner/v1/finance/purchase-sub-order/:purchase_main_order_id',
       // #endif
       isRule: false,
       params: {
@@ -178,10 +178,10 @@ module.exports = {
     {
       title: '订单供货商列表',
       mapFn: "purchaseMainOrderSuppliers",
-      path: '/wholesale-partner/v1/purchase-main-order/:purchase_main_order_id/suppliers',
+      path: '/wholesale-partner/v1/purchase-sub-order/:purchase_sub_order_id/suppliers',
       isRule: false,
       params: {
-        purchase_main_order_id: ['purchase_main_order_id', 'String', '必填'],
+        purchase_sub_order_id: ['purchase_sub_order_id', 'String', '必填'],
       },
       resultKey: "data",
       disabled: true,

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/compontents/OrderInfoButton.vue

@@ -356,7 +356,8 @@ export default {
     },
     //上传发票
     handleUploadInvoice(){
-      this.purchaseMainOrderSuppliers({purchase_main_order_id: this.purchase_main_order_id,})
+      
+      this.purchaseMainOrderSuppliers({purchase_sub_order_id: this.$route.params.id})
         .then(res=>{
           console.log(res,'sss')
           this.tableData = res.data.list
@@ -379,8 +380,8 @@ export default {
     },
     //上传发票form初始化
     initFormUploadInvoice (params) {
-      console.log(params,123123123)
-      this.listFormUploadInvoice = [
+      console.log(params,this.info, 123123123)
+      let listFormUploadInvoice = [
         {
           label: " ",
           ele: "xd-radio",
@@ -414,6 +415,16 @@ export default {
           slot:'tableform'
         }
       ].filter(i=>i)
+
+      let listFormUploadInvoice2 = [
+        {
+          lebel:'',
+          ele:'slot',
+          slot:'tableform'
+        }
+      ]
+
+      this.listFormUploadInvoice = this.info.is_show_partner_invoice ? listFormUploadInvoice : listFormUploadInvoice2
       this.dialogVisibleUploadInvoice = true
       this.renderFormUploadInvoiceKey = Date.now()
       
@@ -467,6 +478,16 @@ export default {
             purchase_main_order_id:this.purchase_main_order_id,
             items:this.tableData
           }
+          let hasEmpty = false;
+          this.tableData.forEach(item => {
+            if(!item.invoice_url){
+              hasEmpty = true;
+            }
+          })
+          if(hasEmpty){
+            this.$message.error('请上传发票')
+            return;
+          }
           this.purchaseMainOrderSupplierUpload(data).then(res=>{
              this.$message({
               message: '上传发票成功',

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/detail.vue

@@ -7,7 +7,7 @@
           <order-button
             v-if="isOperate&&baseData"
             :events="buttonData"
-            :purchase_main_order_id="id"
+            :purchase_main_order_id="purchase_main_order_id"
             :info="baseData['main_order']"
             @refresh="handeleRefresh"
             @confirmPrice="handleConfirmPrice"
@@ -172,6 +172,7 @@ export default {
       formList: null,
       formParams: {},
       id: null,
+      purchase_main_order_id: "",
       renderFormKey: Date.now(),
       customForm: {
         company_id: '',
@@ -199,13 +200,13 @@ export default {
          // #endif
         { "type": "price", "prop": "total_amount1", "align": "center", "label": "订单金额" },
         { "type": "normal", "prop": "supplier_name1", "align": "center", "label": "供应商" },
-        // #ifdef admin
+        // #ifdef admin oa-finance
         { "type": "normal", "prop": "supplier_product_amount1", "align": "center","width":170, "label": "订单金额" },
         { "type": "normal", "prop": "supplier_logistic_amount1", "align": "center","width":170, "label": "运费" },
         { "type": "normal", "prop": "supplier_settlement_amount1", "align": "center","width":170, "label": "供应商结算金额" },
         // #endif
          // #ifdef oa-finance
-        { "type": "price", "prop": "supplier_settlement_amount1", "align": "center","width":170, "label": "实际结算货款" },
+        // { "type": "price", "prop": "supplier_settlement_amount1", "align": "center","width":170, "label": "实际结算货款" },
         // #endif
       ],
       orderHeadersIn:[
@@ -232,13 +233,13 @@ export default {
         { "type": "price", "prop": "total_amount", "align": "center", "label": "订单金额" },
         // #endif
         { "type": "normal", "prop": "supplier_name", "align": "center", "label": "供应商" },
-        // #ifdef admin
+        // #ifdef admin oa-finance
         { "type": "normal", "prop": "supplier_product_amount", "align": "center","width":170, "label": "订单金额" },
         { "type": "normal", "prop": "supplier_logistic_amount", "align": "center","width":170, "label": "运费" },
         { "type": "normal", "prop": "supplier_settlement_amount", "align": "center","width":170, "label": "供应商结算金额" },
         // #endif
         // #ifdef oa-finance
-        { "type": "price", "prop": "actual_settlement_amount", "align": "center","width":170, "label": "实际结算货款" },
+        // { "type": "price", "prop": "actual_settlement_amount", "align": "center","width":170, "label": "实际结算货款" },
         // #endif
       ],
       tables:[],
@@ -302,10 +303,11 @@ export default {
       }
       this.purchaseMainOrderInfo(params).then(res => {
         this.baseData = res.data.order
+        this.purchase_main_order_id = res.data.order.main_order.purchase_main_order_id;
         this.tables = res.data.order.sub_orders
         this.buttonData = res['data']['order']['buttons']
         let product_num = 0;
-        this.tables.map(item=>{
+        this.tables = this.tables.map(item=>{
           item.supplier_settlement_amount = this.$xdHelper.divisionFloatNumber(item.supplier_settlement_amount,100)
           item.supplier_logistic_amount = this.$xdHelper.divisionFloatNumber(item.supplier_logistic_amount,100)
           item.supplier_product_amount = this.$xdHelper.divisionFloatNumber(item.supplier_product_amount,100)
@@ -313,8 +315,8 @@ export default {
           item.order_products.map(ls=>{
             ls.supplier_name = item.supplier_name
             ls.total_amount = item.total_amount
-            ls.supplier_logistic_amount = item.supplier_logistic_amount
-            ls.supplier_product_amount = item.supplier_product_amount
+            ls.supplier_logistic_amount = item.supplier_logistic_amount || 0
+            ls.supplier_product_amount = item.supplier_product_amount || 0
             ls.sale_price = this.$xdHelper.divisionFloatNumber(ls.sale_price, 100)
             ls.purchase_sub_order_id = item.purchase_sub_order_id
             ls.supplier_settlement_amount = item.supplier_settlement_amount
@@ -327,7 +329,9 @@ export default {
             if(item.is_can_edit_amount||item.is_can_edit_amount===0){
                ls.is_can_edit_amount = item.is_can_edit_amount
             }
+            return ls;
           })
+          return item;
         })
         this.product_num = product_num;
         console.log(this.tables,product_num,'this.tables')
@@ -517,7 +521,7 @@ export default {
       }
       console.log(copyData,'ccc')
       let data = {
-        purchase_main_order_id:this.id,
+        purchase_main_order_id: this.purchase_main_order_id,
         items:copyData
       }
       this.supplierSettlementAmountBatch(data)

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/list.vue

@@ -304,7 +304,18 @@ export default {
       let params = this.handleGetSearchForm()
       let loading = Loading.service({})
       this.purchaseMainOrder(params).then(res => {
-        const { orders, total_size, next_page_token } = res.data
+        let { orders, total_size, next_page_token } = res.data
+        // #ifdef oa-finance admin
+        /**
+         * 集采1.5 (加盟商-财务、超管)
+         * 接口从主单列表、详情 切换为 拆单列表详情
+         * 详情页也变换为拆单详情， 传拆单号。
+         */
+        orders = orders.map(item => {
+          item.main_order = item.sub_order;
+          return item;
+        })
+        // #endif
         orders.map(item => {
           item.confirm_time = window.getTimeFormat(item['main_order']['confirm_time'])
           item.purchase_main_order_id = item['main_order']['purchase_main_order_id']
@@ -523,7 +534,11 @@ export default {
     },
 
     getLink ({ row, value, index }) {
-      return `/enterprise_buy/detail/${row.purchase_main_order_id}`
+      let order_id = row.purchase_main_order_id;
+      // #ifdef oa-finance admin
+      order_id = row.main_order.purchase_sub_order_id;
+      // #endif
+      return `/enterprise_buy/detail/${order_id}`
     },
 
     handleCustom ({ action, data }) {

package/library/viewModules/viewsEnterpriseBuy/viewsEnterpriseBuy/table-card.vue

@@ -70,7 +70,7 @@
       </div>
     </div>
     <!-- #ifdef oa-finance -->
-    <div class="card-box_base_item">
+    <div v-if="baseData.is_show_partner_invoice" class="card-box_base_item">
       <span>加盟商发票:</span><span>{{baseData.invoice}}</span>
     </div>
     <div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jufubao-admin-library",
-  "version": "1.1.169",
+  "version": "1.1.170",
   "description": "聚福宝福利后台管理系统公共模块",
   "author": "goashiyong <gaoshiyong1272@vip.163.com>",
   "scripts": {