jufubao-admin-library 1.1.66 → 1.1.67

package/library/pageComponents/modules/JfbProductSearch.vue

@@ -115,7 +115,6 @@ export default {
     ...mapState(['commonParams']),
   },
   async created () {
-    console.log(this.projectType,"projectTypeprojectType");
     let cityData = await this.getAllCityList()
     this.cityData = cityData.data.list
     this.cookieKey = `${this.commonParams.xsiteid}.${this.commonParams.xnamespace}.${this.pagesType}.channel`
@@ -246,6 +245,10 @@ export default {
      * @param form 搜索请求参数
      */
     handleSearch ({ action, form }) {
+      if(action==='reset'){
+        this.category_id = []
+        this.custom_category_id = []
+      }
       if (this.JfbParent.page) this.JfbParent.page = 1
       this.getList(action)
     },
@@ -383,7 +386,7 @@ export default {
           formatValue: "timestamp", //输出时间格式
           placeholder: ["开始时间", "结束时间"],
         },
-        {
+        this.projectType!=='wholesale'&&{
           label: "按价格:", //label
           ele: "xd-input-range", //package 名称
           valueKey: "price_range", //form[valueKey]
@@ -419,13 +422,13 @@ export default {
           },
           notice: "市场价和分销价",
         },
-        {
+        this.projectType!=='wholesale'&&{
           label: "按折扣:", //label
           ele: "xd-input-range", //package 名称
           valueKey: "discount_ratio", //form[valueKey]
+          labelSlot:'按大于等于最低折扣，小于最高折扣(不含)进行搜索',
           value: {},
           disabled: false,
-          labelSlot:'按大于等于最低折扣，小于最高折扣(不含)进行搜索',
           setting: {
             /**单位显示**/
             //图标优先于文字单位

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

@@ -108,6 +108,11 @@ export default {
       default: () => {
       }
     },
+    info: {
+      type: Object,
+      default: () => {
+      }
+    },
   },
   data () {
     return {
@@ -151,7 +156,7 @@ export default {
     }
   },
   created () {
-
+    console.log(this.info,'iiii')
   },
   methods: {
     ...mapActions('enterprise_buy',
@@ -257,6 +262,27 @@ export default {
             }
           ]
         },
+        {
+          label: '商品金额:', 
+          ele: 'el-html', 
+          type: 'text',
+          valueKey: 'supplier_product_amount', 
+          value: this.$xdHelper.divisionFloatNumber(this.info['total_amount'],100), 
+        },
+        {
+          label: '运费金额:', 
+          ele: 'el-html', 
+          type: 'text',
+          valueKey: 'supplier_logistic_amount', 
+          value: this.$xdHelper.divisionFloatNumber(this.info['supplier_logistic_amount'],100), 
+        },
+        {
+          label: '总金额:', 
+          ele: 'el-html', 
+          type: 'text',
+          valueKey: 'total_amount', 
+          value: this.$xdHelper.divisionFloatNumber(this.info['total_amount'],100)+this.$xdHelper.divisionFloatNumber(this.info['supplier_logistic_amount'],100), 
+        },
       ]
 
       this.renderFormSetAmountKey = Date.now()

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

@@ -2,12 +2,13 @@
   <div class="app-container">
     <el-card class="app-container__list">
       <div class="app-container__list-name">
-        <div>{{baseData.main_order.purchase_name}} （{{baseData.main_order.order_status_name}}）</div>
+        <div v-if="baseData">{{baseData.main_order.purchase_name}} （{{baseData.main_order.order_status_name}}）</div>
         <div>
           <order-button
-            v-if="isOperate"
+            v-if="isOperate&&baseData"
             :events="buttonData"
             :purchase_main_order_id="id"
+            :info="baseData['main_order']"
             @refresh="handeleRefresh"
             @confirmPrice="handleConfirmPrice"
           ></order-button>
@@ -15,12 +16,12 @@
       </div>
     </el-card>
     <el-card class="app-container__list">
-      <table-card :orderData="baseData" :key="baseKey"></table-card>
+      <table-card v-if="baseData" :orderData="baseData" :key="baseKey"></table-card>
     </el-card>
     <el-card class="app-container__list">
       <div class="mb-10">商品（{{product_num}}个）</div>
       <div class="export_box">
-        <div class="mb-10">配送至 <i class="el-icon-location-information"></i>{{baseData.main_order.receipt_province_name}}{{baseData.main_order.receipt_city_name}}{{baseData.main_order.receipt_area_name}}{{baseData.main_order.receipt_street_name}}{{baseData.main_order.receipt_address_detail}}</div>
+        <div v-if="baseData" class="mb-10">配送至 <i class="el-icon-location-information"></i>{{baseData.main_order.receipt_province_name}}{{baseData.main_order.receipt_city_name}}{{baseData.main_order.receipt_area_name}}{{baseData.main_order.receipt_street_name}}{{baseData.main_order.receipt_address_detail}}</div>
         <el-button v-if="isExport" type="primary" size="small" @click="handleExport">导出</el-button>
       </div>
       <div class="app-container__list-table">
@@ -61,13 +62,31 @@
               </template>
               <template slot="supplier_settlement_amount" slot-scope="scope">
                 <div v-if="scope.row.is_can_edit_amount===1">
-                  <el-input v-model="scope.row.supplier_settlement_amount" type="number" @change="handleChangeAmount(scope.row.supplier_settlement_amount,scope1)" placeholder="请输入清单结算金额"></el-input>
+                  <el-input disabled v-model="scope.row.supplier_settlement_amount" type="number" @change="handleChangeAmount(scope.row.supplier_settlement_amount,scope1,'supplier_settlement_amount')" placeholder="请输入清单结算金额"></el-input>
                   <span class="red">结算金额为最终支付金额</span>
                 </div>
                 <div v-else>
                   <span class="red">{{scope.row.supplier_settlement_amount}}</span>元
                 </div>
               </template>
+              <template slot="supplier_product_amount" slot-scope="scope">
+                <div v-if="scope.row.is_can_edit_amount===1">
+                  <el-input v-model="scope.row.supplier_product_amount" type="number" @change="handleChangeAmount(scope.row.supplier_product_amount,scope1,'supplier_product_amount')" placeholder="请输入订单金额"></el-input>
+                  <span class="red">结算金额为最终支付金额</span>
+                </div>
+                <div v-else>
+                  <span class="red">{{scope.row.supplier_product_amount}}</span>元
+                </div>
+              </template>
+              <template slot="supplier_logistic_amount" slot-scope="scope">
+                <div v-if="scope.row.is_can_edit_amount===1">
+                  <el-input v-model="scope.row.supplier_logistic_amount" type="number" @change="handleChangeAmount(scope.row.supplier_logistic_amount,scope1,'supplier_logistic_amount')" placeholder="请输入运费"></el-input>
+                  <span class="red">结算金额为最终支付金额</span>
+                </div>
+                <div v-else>
+                  <span class="red">{{scope.row.supplier_logistic_amount}}</span>元
+                </div>
+              </template>
             </xd-table>
           </template>
         </xd-table>
@@ -181,6 +200,8 @@ export default {
         { "type": "price", "prop": "total_amount1", "align": "center", "label": "订单金额" },
         { "type": "normal", "prop": "supplier_name1", "align": "center", "label": "供应商" },
         // #ifdef admin
+        { "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
@@ -212,6 +233,8 @@ export default {
         // #endif
         { "type": "normal", "prop": "supplier_name", "align": "center", "label": "供应商" },
         // #ifdef admin
+        { "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
@@ -284,15 +307,20 @@ export default {
         let product_num = 0;
         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)
           product_num+=item.order_products.length
           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.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
             ls.supplier_settlement_amount_finace = item.supplier_settlement_amount
             ls.actual_settlement_amount = item.actual_settlement_amount
+            
             if(item.dist_amount){
               ls.sub_dist_amount = item.dist_amount
             }
@@ -414,7 +442,10 @@ export default {
         let { row, column, rowIndex, columnIndex } = data
         let mergeColumns = [];
         //rowIndex，columnIndex的值是从0开始
-        // #ifdef admin oa-finance
+        // #ifdef admin
+        mergeColumns = [5,6,7,8,9] //第4列需要合并行，并且合并到数组最大值,
+        // #endif
+        // #ifdef oa-finance
         mergeColumns = [5,6,7] //第4列需要合并行，并且合并到数组最大值,
         // #endif
         // #ifdef partner-wholesale
@@ -451,9 +482,38 @@ export default {
           this.$message.error('小数点后最多保留两位小数')
           return
         }
+        if(!reg.test(Number(copyData[i]['supplier_product_amount']))){
+          this.$message.error('小数点后最多保留两位小数')
+          return
+        }
+        if(!reg.test(Number(copyData[i]['supplier_logistic_amount']))){
+          this.$message.error('小数点后最多保留两位小数')
+          return
+        }
         if(copyData[i]['supplier_settlement_amount']){
           copyData[i]['amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_settlement_amount']),100)
+          copyData[i]['supplier_settlement_amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_settlement_amount']),100)
+        }
+        if(copyData[i]['supplier_product_amount']){
+          copyData[i]['supplier_product_amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_product_amount']),100)
+        }
+        if(copyData[i]['supplier_logistic_amount']){
+          copyData[i]['supplier_logistic_amount'] = this.$xdHelper.multiplyFloatNumber(Number(copyData[i]['supplier_logistic_amount']),100)
         }
+        copyData[i]['order_products'].map(item=>{
+          if(item.supplier_product_amount){
+            item.supplier_product_amount= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_product_amount),100)
+          }
+          if(item.supplier_settlement_amount){
+            item.supplier_settlement_amount= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_settlement_amount),100)
+          }
+          if(item.supplier_settlement_amount_finace){
+            item.supplier_settlement_amount_finace= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_settlement_amount_finace),100)
+          }
+          if(item.supplier_logistic_amount){
+            item.supplier_logistic_amount= this.$xdHelper.multiplyFloatNumber(Number(item.supplier_logistic_amount),100)
+          }
+        })
       }
       console.log(copyData,'ccc')
       let data = {
@@ -472,8 +532,32 @@ export default {
       })
     },
     //结算金额改变
-    handleChangeAmount(value,scope1){
-      this.$set(this.tables[scope1['index']],'supplier_settlement_amount',value)
+    handleChangeAmount(value,scope1,type){
+      // debugger
+      if(type==='supplier_settlement_amount'){
+        this.$set(this.tables[scope1['index']],type,value)
+      }else if(type==='supplier_product_amount'){
+        this.$set(this.tables[scope1['index']],type,value)
+        let num = 0;
+        num = Number(value) + Number(this.tables[scope1['index']]['supplier_logistic_amount'])
+        this.$set(this.tables[scope1['index']],'supplier_settlement_amount',num)
+      }else if(type==='supplier_logistic_amount'){
+        this.$set(this.tables[scope1['index']],type,value)
+        let num = 0;
+        num = Number(value) + Number(this.tables[scope1['index']]['supplier_product_amount'])
+        this.$set(this.tables[scope1['index']],'supplier_settlement_amount',num)
+        console.log(num,'nnn')
+      }
+      this.tables.map(item=>{
+        item.order_products.map(ls=>{
+          ls.supplier_product_amount = item.supplier_product_amount
+          ls.supplier_logistic_amount = item.supplier_logistic_amount
+          ls.supplier_settlement_amount = item.supplier_settlement_amount
+          ls.supplier_settlement_amount_finace = item.supplier_settlement_amount
+        })
+      })
+      this.tableRefresh = Date.now()
+      this.tableKey = Date.now()
        console.log(this.tables,value,scope1,2222)
     },
     goBack () {

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

@@ -13,7 +13,7 @@
         <span>清单预算:</span><span class="red">{{$xdHelper.divisionFloatNumber(baseData.purchase_plan_amount, 100)}}</span>
       </div>
       <div class="card-box_base_item">
-        <span>总金额:</span><span class="red">{{$xdHelper.divisionFloatNumber(baseData.total_amount, 100)}}</span>
+        <span>商品金额:</span><span class="red">{{$xdHelper.divisionFloatNumber(baseData.total_amount, 100)}}</span>
          <el-tooltip
           popper-class="notice-popper"
           placement="top"
@@ -27,6 +27,17 @@
       <!-- #endif -->
       <div class="card-box_base_item">
         <span>用户实际结算金额:</span><span class="red">{{baseData.user_settlement_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.user_settlement_amount, 100)}}</span>
+      </div>
+       <!-- #ifdef admin -->
+      <div class="card-box_base_item">
+        <span>结算总金额:</span><span class="red">{{baseData.supplier_settlement_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.supplier_settlement_amount, 100)}}</span>
+      </div>
+      <div class="card-box_base_item">
+        <span>订单金额:</span><span class="red">{{baseData.supplier_product_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.supplier_product_amount, 100)}}</span>
+      </div>
+       <!-- #endif -->
+       <div class="card-box_base_item">
+        <span>运费金额:</span><span class="red">{{baseData.supplier_logistic_amount===-1?'--':$xdHelper.divisionFloatNumber(baseData.supplier_logistic_amount, 100)}}</span>
       </div>
       <!-- #ifdef oa-finance -->
       <div class="card-box_base_item">

package/package.json

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