Merge branch 'dev' of http://git.echepei.com/tubao/Smart_platform_ui into dev

src/components/report-dialog/main.vue

@@ -207,16 +207,17 @@ export default {
           }
         });
       } else if (name == "经销商-可用库存表.ureport.xml") {
+        let tenantId = JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id;
         this.$router.push({
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
           query: {
-            tradeType: "GN",
+            // tradeType: tenantId === "922648"?"JXS":"GN",
+            ...this.searchValue,
             tenantId: tenantId
           }
         });
       } else if (name == "客户信息.ureport.xml") {
-        let userId = JSON.parse(localStorage.getItem("saber-userInfo")).content
-          .user_id;
+        let userId = JSON.parse(localStorage.getItem("saber-userInfo")).content.user_id;
         this.$router.push({
           path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`,
           query: {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -1902,6 +1902,16 @@ export default {
         delete this.form.orderItemsList
         delete this.form.orderFeesList
         delete this.form.orderFilesList
+        delete this.form.createFreightUser
+        delete this.form.createPurchaseUser
+        delete this.form.createPurchaseTime
+        delete this.form.createFreightTime
+        delete this.form.createFreight
+        delete this.form.createPurchase
+        delete this.form.specialCheckTime
+        delete this.form.specialCheckUser
+        delete this.form.specialCheckStatus
+        delete this.form.specialCheck
         // delete this.form.corpName
         delete this.form.belongToCorpList
         // 获取最大值

src/views/dealer/allocation/index.vue

@@ -237,6 +237,7 @@ export default {
       this.$store.commit("BX_IN_DETAIL");
     },
     onLoad(page, params) {
+      params = this.search
       // 重置掉展开
       this.dataList.forEach(item => {
         this.$refs.crud.toggleRowExpansion(item, false)

src/views/dealer/sales/detail.vue

@@ -820,8 +820,7 @@ export default {
             balanceAmount: 0,
             surplusRouteQuantity: 0
           };
-        this.$set(form,"purchaseAmount",a.inQuantity ? a.inQuantity == 0 ? 0 : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2) : 0
-        );
+        this.$set(form,"purchaseAmount",a.inQuantity ? a.inQuantity == 0 ? 0 : (Number(a.inAmount) / Number(a.inQuantity)).toFixed(2) : 0 );
         this.$set(form, "stock", a.surplusRouteQuantity);
       })
         .finally(() => {
@@ -921,7 +920,7 @@ export default {
                 item.unit = e.unit;
                 item.size = e.size;
                 item.priceCategory = e.goodsTypeName;
-                item.purchaseAmount = e.purchaseAmount;
+                // item.purchaseAmount = e.purchaseAmount;
                 item.batch = e.batch;
                 item.newDate = e.newDate;
                 item.newJob = e.newJob;

src/views/dealer/stock/index.vue

@@ -210,6 +210,7 @@ export default {
       done();
     },
     onLoad(page, params = {}) {
+      params = this.search
       if (this.search.createTime && this.search.createTime.length > 0) {
         params = {
           ...params,

src/views/landTransportation/driver/index.vue

@@ -323,6 +323,7 @@ export default {
           width: 90,
           search: true,
           index:7,
+          overHidden: true,
           filterable: true,
           // overHidden: true,
           prop: 'fleetId',

src/views/landTransportation/reportAnalysis/index.vue

@@ -559,6 +559,7 @@ export default {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
+              overHidden: true,
               index: 2,
               width: 70,
             }, {
@@ -669,6 +670,7 @@ export default {
             label: '业务员',
             prop: 'salesmanName',
             search: true,
+            overHidden: true,
             index: 2,
             width: 70,
           }, {
@@ -741,6 +743,7 @@ export default {
             label: '业务员',
             prop: 'salesmanName',
             search: true,
+            overHidden: true,
             index: 2,
             width: 70,
           }, {
@@ -1010,6 +1013,7 @@ export default {
                 label: '业务员',
                 prop: 'salesmanName',
                 search: true,
+                overHidden: true,
                 index: 2,
                 width: 70,
               }, {
@@ -1120,6 +1124,7 @@ export default {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
+              overHidden: true,
               index: 2,
               width: 70,
             }, {
@@ -1192,6 +1197,7 @@ export default {
               label: '业务员',
               prop: 'salesmanName',
               search: true,
+              overHidden: true,
               index: 2,
               width: 70,
             }, {

src/views/statisticAnalysis/salesDetails/index.vue

@@ -10,6 +10,12 @@
           </el-button>
           <el-button type="info" size="small" @click="switchDialog = !switchDialog">报表打印</el-button>
         </template>
+        <template slot="brandSearch">
+          <el-select v-model="search.brand" filterable clearable>
+            <el-option v-for="(item, index) in brandOption" :key="index" :label="item.dictValue"
+                       :value="item.dictValue" />
+          </el-select>
+        </template>
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="KH"></crop-select>
         </template>
@@ -52,6 +58,7 @@ export default {
   data() {
     return {
       form: {},
+      brandOption:[],
       search: {
         careteTime:[defaultDate(4)[0] + ' 00:00:00',defaultDate(4)[1] + ' 23:59:59']
       },
@@ -116,8 +123,7 @@ export default {
           {
             label: "品牌",
             prop: "brand",
-            // hide: true,
-            // showColumn: false,
+            type: "select",
             search: true
           },
           {
@@ -191,7 +197,9 @@ export default {
   async created() {
     this.option = await this.getColumnData(this.getColumnName(130.1), this.optionBack);
     // this.option = this.optionBack
-    console.log(this.option);
+    this.getWorkDicts('brand').then(res => {
+      this.brandOption = res.data.data;
+    })
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++

src/views/statisticAnalysis/salesProfitN/index.vue

@@ -82,7 +82,7 @@ export default {
         searchSpan: 8,
         border: true,
         index: true,
-        addBtn: true,
+        addBtn: false,
         viewBtn: false,
         editBtn: false,
         delBtn: false,