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

src/api/standAlone/saleLeads.js

@@ -58,4 +58,12 @@ export function getGoodsDescList() {
     url: '/api/blade-client/affairsdesc/getGoodsDescList',
     method: 'get',
   })
+}
+// 保存&&修改
+export function leadsSubmit(data) {
+  return request({
+    url: '/api/trade-purchase/leads/leadsSubmit',
+    method: 'post',
+    data
+  })
 }

src/views/saleLeads/detail.vue

@@ -130,7 +130,7 @@ import { gainUser } from "@/api/basicData/customerInquiry";
 import { getUserInfo } from "@/api/system/user";
 import { getDeptTree } from "@/api/system/dept";
 import { getCurrentDate } from "@/util/date";
-import { dataDetail, typeSave, removeGoods, pleaseCheck, getGoodsDescList } from "@/api/standAlone/saleLeads";
+import { dataDetail, typeSave, removeGoods, pleaseCheck, getGoodsDescList, leadsSubmit } from "@/api/standAlone/saleLeads";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
@@ -454,10 +454,20 @@ export default {
         ...this.form,
         itemList: this.dataList
       }
-      this.$router.push({
-        path: '/workManagement/main-items/list',
-        query: { data: data }
-      });
+      this.btnLoading = true;
+      leadsSubmit(data).then(res => {
+        this.$message.success('提交成功')
+        // this.$message({ type: "success", message: this.form.id ? "修改成功!" : "新增成功!" });
+        // this.queryData(res.data.data);
+        data.corpId=res.data.data
+        this.$router.push({
+          path: '/workManagement/main-items/list',
+          query: { data: data }
+        });
+      }).finally(() => {
+        this.btnLoading = false;
+      })
+
     },
     getCropId(row) {
       this.form.corpId = row

src/views/salesManagement/salesContract/detailsPage.vue

@@ -189,8 +189,11 @@
             <template slot="menuLeft" slot-scope="{ row }">
               <el-button type="primary" icon="el-icon-plus" size="small" :disabled="viewDisabled"
                 :loading="buttonLoading" @click="newDetails">录入明细</el-button>
-              <el-button type="warning" size="small" :loading="buttonLoading"
+<!--              <el-button type="warning" size="small" :loading="buttonLoading"
                 :disabled="selection.length ==0|| form.status!=1 " @click="generateShipmentD">生成发货单
+              </el-button>-->
+              <el-button type="warning" size="small" :loading="buttonLoading"
+                          @click="generateShipmentD">生成发货单
               </el-button>
               <!--              <el-button type="info"
                          size="small"

src/views/statisticAnalysis/salesDetails/index.vue

@@ -258,19 +258,21 @@ export default {
     editOpen(row) {
     },
     outExport() {
-      let queryParams = this.search
-      if (queryParams.arrivalTime) {
-        queryParams.beginCreateTime = queryParams.careteTime[0]
-        queryParams.endCreateTime = queryParams.careteTime[1]
-        delete queryParams.careteTime
-      }
-      const routeData = this.$router.resolve({
-        path: '/api/blade-land/order/acct-export',      //跳转目标窗口的地址
-        query: {
-          ...queryParams    //括号内是要传递给新窗口的参数
+      let params = { ...this.search }
+      if (params.careteTime && params.careteTime.length > 0) {
+        params = {
+          ...params,
+          beginCreateTime: params.careteTime[0] + ' 00:00:00',
+          endCreateTime: params.careteTime[1] + ' 23:59:59',
+        }
+      } else {
+        params = {
+          ...params,
+          beginCreateTime: '',
+          endCreateTime: '',
         }
-      })
-      window.open(routeData.href.slice(1, routeData.href.length - 1) + '&' + `${this.website.tokenHeader}=${getToken()}`);
+      }
+      window.open(`/api/blade-purchase-sales/exportOrder/selBusinessExport?${this.website.tokenHeader}=${getToken()}&corpId=${params.corpId}&salesName=${params.salesName}&beginCreateTime=${params.beginCreateTime}&endCreateTime=${params.endCreateTime}`);
     }
   }
 };