Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -52,6 +52,7 @@
         <el-descriptions-item :label="$t('产线')">{{ basic.prodline || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t('特殊说明')">{{ basic.specalnote || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`产品标准`)">{{ basic.standards || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`标准明细`)">{{ basic.standardsmx || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`重量`)">{{$t(`毛重`)}}:{{ basic.grossweight || '--'}};{{$t(`净重`)}}:{{basic.weight || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`条形码`)">{{ basic.barcode}}</el-descriptions-item>-->
         <el-descriptions-item  :label="$t(`是否序列号管理`)" >

src/HDrpManagement/ProductMag/modules/add.vue

@@ -102,12 +102,24 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`产品标准`)">
-                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable>
+                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable @change="standardChange">
                   <el-option
                     v-for="item in standards"
                     :key="item.value"
                     :label="$t(item.value)"
-                    :value="item.value">
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`标准明细`)">
+                <el-select style="width:43.5%" v-model="form.standardsmx" :placeholder="$t('请选择')" clearable >
+                  <el-option
+                      v-for="item in standardsmx"
+                      :key="item.index"
+                      :label="$t(item)"
+                      :value="item">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -376,6 +388,7 @@ export default {
         "pressure": "", //可选,压力
         "material": "", //可选,材质
         "standards": "", //可选,产品标准
+        "standardsmx":"",//产品标准明细
         "tradefields": '', //可选,领域
         "stockstatus2": '', //可选,库存缺货标准
         "stockstatus1": '', //可选,库存充足标准
@@ -432,6 +445,7 @@ export default {
       bindData:{},
       tradefield:[],// 领域
       standards:[],// 产品标准
+      standardsmx:[],//产品标准明细
       pressures:[],// 压力等级
       itemmaterial:[], // 材质
       butterflyplatedrive:[],// 蝶板驱动
@@ -522,6 +536,11 @@ export default {
       const res = await this.$store.dispatch('optiontypeselect','itemstandards')
       this.standards = res.data
     },
+    standardChange(val){
+      this.form.standards = val.value
+      this.form.standardsmx = ''
+      this.standardsmx = val.subvalues
+    },
 
     // 查询压力等级
     async pressureData () {

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -102,12 +102,24 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`产品标准`)">
-                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable>
+                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable @change="standardChange">
                   <el-option
                     v-for="item in standards"
                     :key="item.value"
                     :label="$t(item.value)"
-                    :value="item.value">
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`标准明细`)">
+                <el-select style="width:43.5%" v-model="form.standardsmx" :placeholder="$t('请选择')" clearable >
+                  <el-option
+                      v-for="item in standardsmx"
+                      :key="item.index"
+                      :label="$t(item)"
+                      :value="item">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -402,7 +414,8 @@ export default {
         "prodline": "",
         "device": "",
         "tags":"",
-        "categories":""
+        "categories":"",
+        "standardsmx":""
       },
       rules:{
          itemno: [
@@ -446,7 +459,8 @@ export default {
       tagList:[],
       siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       categoriesList:[],
-      prodlines:[]
+      prodlines:[],
+      standardsmx:[]
     }
   },
   computed: {
@@ -498,7 +512,11 @@ export default {
       const res = await this.$store.dispatch('optiontypeselect','itemstandards')
       this.standards = res.data
     },
-
+    standardChange(val){
+      this.form.standards = val.value
+      this.form.standardsmx = ''
+      this.standardsmx = val.subvalues
+    },
     // 查询压力等级
     async pressureData () {
       const res = await this.$store.dispatch('optiontypeselect','pressurelevel')

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

@@ -3,7 +3,7 @@
     <el-tabs v-if="rebHeadData.length > 0" v-model="activeName" type="border-card" @tab-click="handleClick">
       <el-tab-pane v-for="item in rebHeadData" :key="item.index" :label="item.title" :name="item.title">
         <el-descriptions class="margin-top mt-10" title="居间明细" :column="2" size="small" border>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.calculatemodel == 1?item.orderratio:'--'}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.calculatemodel == 1?Math.round((item.orderratio * 100)*100)/100 + '%':'--'}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额">{{item.amount?tool.formatAmount(item.amount,2):''}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{item.calculatemodel == 2?Math.round((item.productdiscount * 100)*100)/100 + '%':'--'}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="居间费">{{tool.formatAmount(item.rebate,2)}}</el-descriptions-item>