Merge branch 'mergeBranch' into blueBranch

src/views/salesData/modules/shippingTrendAnalysis.vue

@@ -16,6 +16,9 @@
           </div>
         </div>
         <div class="in">
+          <div class="inline-16 mt-10">
+            <el-checkbox v-model="param.content.isbooked" true-label="1" false-label="0" @change="changeDate">{{$t(`包含备货数据`)}}</el-checkbox>
+          </div>
           <div class="inline-16 mt-10">
             <departmentSalesperson ref="departmentSalesperson" @depSelect="depSelect" @personSelect="personSelect" :isFull="isFull"></departmentSalesperson>
           </div>
@@ -74,6 +77,7 @@ export default {
           "type": 0,
           "dataid": '',
           "year": "2023",
+          "isbooked":0,
           "where":{
             "isleave":"1"
           }