Browse Source

货代报表传参 2024-3-20

caojunjie 1 year ago
parent
commit
fa034f5b61

+ 2 - 0
src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -589,6 +589,7 @@
               billId:this.id,
               billId:this.id,
               reportCode:this.form.classifyCode,
               reportCode:this.form.classifyCode,
               groupCode:this.form.groupCode,
               groupCode:this.form.groupCode,
+              type:this.businessValue
           })
           })
           // 获取的数据赋值
           // 获取的数据赋值
           var data = res.data.data.data
           var data = res.data.data.data
@@ -679,6 +680,7 @@
                   billId:this.id,
                   billId:this.id,
                   reportCode:row.classifyCode,
                   reportCode:row.classifyCode,
                   groupCode:row.groupCode,
                   groupCode:row.groupCode,
+                  type:this.businessValue
               }).then(res => {
               }).then(res => {
                   // var data = res.data.data.data.map((item,index)=>{
                   // var data = res.data.data.data.map((item,index)=>{
                   //     item.index = index
                   //     item.index = index

+ 35 - 0
src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -44,6 +44,12 @@
                         <el-switch v-model="form.whether" :disabled="disabled || isWhether" active-text="是"
                         <el-switch v-model="form.whether" :disabled="disabled || isWhether" active-text="是"
                             inactive-text="否" active-value="1" inactive-value="0" />
                             inactive-text="否" active-value="1" inactive-value="0" />
                     </template>
                     </template>
+                    <template slot="whetherIntegral" slot-scope="{disabled}">
+                        <!--<el-switch v-model="form.whetherIntegral" active-text="是" inactive-text="否" active-value="1" inactive-value="0" @change="whetherChange"/>-->
+                        <el-switch v-model="form.whetherIntegral" :disabled="disabled" active-text="是"
+                                   inactive-text="否" active-value="1" inactive-value="0" />
+                    </template>
+
                     <template slot="explosionProof" slot-scope="{disabled}">
                     <template slot="explosionProof" slot-scope="{disabled}">
                         <!--<el-switch v-model="form.explosionProof" :disabled="disabled" active-text="是" inactive-text="否"-->
                         <!--<el-switch v-model="form.explosionProof" :disabled="disabled" active-text="是" inactive-text="否"-->
                         <!--    active-value="1" inactive-value="0" />-->
                         <!--    active-value="1" inactive-value="0" />-->
@@ -484,6 +490,35 @@ export default {
                         }]
                         }]
                     },
                     },
                     {
                     {
+                        label: "是否积分商品",
+                        prop: "whetherIntegral",
+                        labelWidth: 120,
+                        span: 8,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "兑换积分(推荐人)",
+                        prop: "referenceIntegral",
+                        labelWidth: 120,
+                        span: 8
+                    },
+                    {
+                        label: "兑换积分(业务员)",
+                        prop: "salesmanIntegral",
+                        labelWidth: 120,
+                        span: 8
+                    },
+                    {
+                        label: "兑换积分",
+                        prop: "integral",
+                        span: 8
+                    },
+
+                    {
                         label: "备注",
                         label: "备注",
                         prop: "remarks",
                         prop: "remarks",
                         type: "textarea",
                         type: "textarea",