2023-12-05 plm报价

src/api/quotation/quotationHeader.js

@@ -5,7 +5,7 @@ import { createAPI } from "@/utils/httpRequest.js";
  * @param data
  * @returns {*}
  */
-export const getQuotationHeaderByPage = (data) => createAPI(`/plm/quotationHeader/getQuotationHeaderByPage`,'get',data);
+export const getQuotationHeaderByPage = (data,ids) => createAPI(`/plm/quotationHeader/getQuotationHeaderByPage`+ids,'get',data);
 
 /**
  * 新增报价信息 QuotationHeader

src/views/modules/quotation/sellForQuotation.vue

@@ -1,28 +1,40 @@
 <template>
-  <div class="mode-config" style="padding: 5px">
-    <el-form :inline="true" label-position="top" :model="searchData">
-      <el-row>
-        <el-col :span="24">
+  <div class="mode-config">
+    <el-form label-position="top" :model="searchData">
+      <el-row :gutter="18">
+        <el-col :span="2">
           <el-form-item label="客户编码">
-            <el-input v-model="searchData.customerNo" clearable style="width: 120px"/>
+            <el-input v-model="searchData.customerNo" clearable />
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="客户名称">
-            <el-input v-model="searchData.customerName" clearable style="width: 120px"/>
+            <el-input v-model="searchData.customerName" clearable />
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="跟单员">
-            <el-input v-model="searchData.trackerName" clearable style="width: 120px"/>
+            <el-input v-model="searchData.trackerName" clearable/>
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="报价单号">
-            <el-input v-model="searchData.quotationNo" clearable style="width: 120px"/>
+            <el-input v-model="searchData.quotationNo" clearable />
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="客户询价单号">
-            <el-input v-model="searchData.customerInquiryNo" clearable style="width: 120px"/>
+            <el-input v-model="searchData.customerInquiryNo" clearable />
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="内部询价单号">
-            <el-input v-model="searchData.internalInquiryNo" clearable style="width: 120px"/>
+            <el-input v-model="searchData.internalInquiryNo" clearable/>
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="状态">
-            <el-select v-model="searchData.quotationStatus" style="width: 120px">
+            <el-select v-model="searchData.quotationStatus">
               <el-option label="全部" value=""></el-option>
               <el-option label="草稿" value="草稿"></el-option>
               <el-option label="下达" value="下达"></el-option>
@@ -30,36 +42,67 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row>
-        <el-col :span="24">
+      <el-row :gutter="18">
+        <el-col :span="2">
           <el-form-item label="项目编码">
-            <el-input v-model="searchData.projectId" clearable style="width: 120px"/>
+            <el-input v-model="searchData.projectId" clearable />
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="项目名称">
-            <el-input v-model="searchData.projectName" clearable style="width: 120px"/>
+            <el-input v-model="searchData.projectName" clearable/>
           </el-form-item>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label="销售员">
-            <el-input v-model="searchData.quoterName" size="large" clearable style="width: 120px;height: 28px"/>
-          </el-form-item>
-          <el-form-item label="报价日期">
-            <el-date-picker
-              style="width: 255px"
-              v-model="searchData.dateValue"
-              type="daterange"
-              size="mini"
-              unlink-panels
-              format="yyyy/MM/dd"
-              value-format="yyyy-MM-dd"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="changeDateRange"
-              placeholder="选择日期">
-            </el-date-picker>
+            <el-input v-model="searchData.quoterName" size="large" clearable/>
           </el-form-item>
+        </el-col>
+        <el-col :span="4">
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="开始日期">
+                <el-date-picker
+                  :picker-options="{
+                    disabledDate : time => {
+                      return new Date(searchData.endDate).getTime() < time.getTime()
+                    }
+                  }"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  v-model="searchData.startDate"
+                  type="date"
+                  placeholder="开始日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-form-item label=" ">
+                <svg t="1701739447362" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8471" id="mx_n_1701739447363" width="20" height="20"><path d="M524.288 804.864l444.416-294.912-444.416-294.912v143.36H81.92V655.36h442.368v149.504z m0 0" p-id="8472"></path></svg>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item label="结束日期">
+                <el-date-picker
+                  :picker-options="{
+                    disabledDate : time => {
+                      return time.getTime() < new Date(searchData.startDate).getTime()
+                    }
+                  }"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  v-model="searchData.endDate"
+                  type="date"
+                  placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+        <el-col :span="2">
           <el-form-item label=" ">
-            <el-button plain type="primary" @click="initData" @keyup.enter.native="initData">查询</el-button>
-            <el-button type="primary" @click="insertDiaLogFlag = true">新增</el-button>
+            <el-button plain type="primary" @click="initDataBtn" @keyup.enter.native="initDataBtn">查 询</el-button>
+            <el-button type="primary" @click="insertDiaLogFlag = true">新 增</el-button>
           </el-form-item>
         </el-col>
       </el-row>
@@ -264,37 +307,21 @@
 <!--            <el-form-item prop="quoter" label="销售员">-->
             <el-form-item label="销售员">
               <span slot="label" style="" v-if="insertData.internalInquiryNo ==''" @click="getBaseList(103,2)"><a herf="#">销售员</a></span>
-              <el-input v-model="insertData.quoterName" :disabled="insertData.internalInquiryNo !=''" @clear="clearQuoter" placeholder="请输入内容" clearable />
+              <el-input v-model="insertData.quoterName" @clear="clearQuoter" placeholder="请输入内容" clearable />
             </el-form-item>
           </el-col>
           <el-col :span="12" :offset="2">
             <el-form-item label="跟单员">
 <!--            <el-form-item prop="tracker" label="跟单员">-->
-              <span slot="label" style="" @click="getBaseList(103,1)"><a herf="#">跟单员</a></span>
-              <el-input v-model="insertData.trackerName" @clear="clearTracker" placeholder="请输入内容" size="large" clearable />
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <el-form-item label="状态" prop="quotationStatus">
-              <el-select v-model="insertData.quotationStatus" style="width: 100%" :disabled="insertData.internalInquiryNo !=''" clearable placeholder="请选择" >
-                <el-option label="草稿" value="草稿"></el-option>
-                <el-option label="下达" value="下达"></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12" :offset="2">
-            <el-form-item label=" ">
-              <el-checkbox v-model="insertData.requireApproval" style="width: 23%" true-label="0" false-label="1" label="需要审批"></el-checkbox>
-              <el-checkbox v-model="insertData.approvalStatus" style="width: 22%" true-label="已审批" false-label="未审批" label="是否审批"></el-checkbox>
+              <span slot="label" style="" v-if="insertData.internalInquiryNo ==''" @click="getBaseList(103,1)"><a herf="#">跟单员</a></span>
+              <el-input v-model="insertData.trackerName" :disabled="insertData.internalInquiryNo !=''" @clear="clearTracker" placeholder="请输入内容" size="large" clearable />
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-form-item label="备注" style="width: 100%;min-height: 70px">
-              <el-input type="textarea" style="width: 100%" :show-word-limit="true" v-model="insertData.remark"/>
+            <el-form-item label="备注" style="width: 100%;min-height: 90px">
+              <el-input type="textarea" style="width: 100%" :autosize="{minRows: 3, maxRows: 3}" v-model="insertData.remark"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -367,6 +394,7 @@ export default {
   },
   data () {
     return {
+      searchFlag:false,
       // 搜索条件对象
       searchData:{
         site:this.$store.state.user.site,// 工厂编号
@@ -509,8 +537,21 @@ export default {
         this.searchData.endDate="";
       }
     },
+    // 查询
+    initDataBtn(){
+      this.$route.params.ids = null;
+      this.initData();
+    },
     // 初始化数据
     initData(){
+      let ids = ""
+      if (this.$route.params.ids){
+        ids = "?"
+        for (let i = 0; i < this.$route.params.ids.length; i++) {
+          ids+='ids='+this.$route.params.ids[i]+'&'
+        }
+        ids = ids.substring(0,ids.length-1);
+      }
       let params = {
         no:this.no,
         size:this.size,
@@ -529,7 +570,7 @@ export default {
         endDate: this.searchData.endDate,
       }
       this.initQuotationHeaderLoading = true;
-      getQuotationHeaderByPage(params).then(({data})=>{
+      getQuotationHeaderByPage(params,ids).then(({data})=>{
         this.tableData = data.data.records;
         this.total = data.data.total;
         if (this.tableData.length > 0){
@@ -755,7 +796,7 @@ export default {
       this.height = window.innerHeight / 2 - 240;
     })
   },
-  created () {
+  activated () {
     this.initData();//初始化数据
   },
 }

src/views/modules/quotation/toBeQuoted.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-form label-position="top" :model="searchData" @keyup.enter.native="getDataList">
-      <el-row :gutter="15">
+      <el-row :gutter="20">
         <el-col :span="2">
           <el-form-item label="客户编码">
             <el-input v-model="searchData.customerNo" clearable></el-input>
@@ -28,25 +28,48 @@
           </el-form-item>
         </el-col>
         <el-col :span="4">
-          <el-form-item label="要求完成日期">
-            <el-date-picker
-              v-model="searchData.dateValue"
-              type="daterange"
-              style="width: 100%"
-              size="mini"
-              unlink-panels
-              format="yyyy/MM/dd"
-              value-format="yyyy-MM-dd"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="changeDateRange"
-              placeholder="选择日期">
-            </el-date-picker>
-          </el-form-item>
+          <el-row>
+            <el-col :span="11">
+              <el-form-item label="开始日期">
+                <el-date-picker
+                  :picker-options="{
+                    disabledDate : time => {
+                      return new Date(searchData.endDate).getTime() < time.getTime()
+                    }
+                  }"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  v-model="searchData.startDate"
+                  type="date"
+                  placeholder="开始日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <el-col :span="2">
+              <el-form-item label=" ">
+                <svg t="1701739447362" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8471" id="mx_n_1701739447363" width="20" height="20"><path d="M524.288 804.864l444.416-294.912-444.416-294.912v143.36H81.92V655.36h442.368v149.504z m0 0" p-id="8472"></path></svg>
+              </el-form-item>
+            </el-col>
+            <el-col :span="11">
+              <el-form-item label="结束日期">
+                <el-date-picker
+                  :picker-options="{
+                    disabledDate : time => {
+                      return time.getTime() < new Date(searchData.startDate).getTime()
+                    }
+                  }"
+                  value-format="yyyy-MM-dd"
+                  style="width: 100%"
+                  v-model="searchData.endDate"
+                  type="date"
+                  placeholder="结束日期">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-row>
         </el-col>
       </el-row>
-      <el-row :gutter="15">
+      <el-row :gutter="20">
         <el-col :span="2">
           <el-form-item label="项目编码">
             <el-input v-model="searchData.projectId" clearable></el-input>
@@ -151,7 +174,7 @@ export default {
         trackerName: '',
         testPartNo: '',
         partName: '',
-        quotationStatus: '草稿',
+        quotationStatus: '下达',
         startDate: '',
         endDate: '',
         projectId: '',
@@ -218,7 +241,7 @@ export default {
           tableName: '报价信息表',
           columnProp: 'customerDesc',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '客户名称',
           columnHidden: false,
           columnImage: false,
@@ -254,7 +277,7 @@ export default {
           tableName: '报价信息表',
           columnProp: 'projectName',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '项目名称',
           columnHidden: false,
           columnImage: false,
@@ -272,7 +295,7 @@ export default {
           tableName: '报价信息表',
           columnProp: 'trackerName',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '跟单员',
           columnHidden: false,
           columnImage: false,
@@ -290,7 +313,7 @@ export default {
           tableName: '报价信息表',
           columnProp: 'quoterName',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '报价专员',
           columnHidden: false,
           columnImage: false,
@@ -326,7 +349,7 @@ export default {
           tableName: '报价信息表',
           columnProp: 'partName',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '物料名称',
           columnHidden: false,
           columnImage: false,
@@ -416,7 +439,7 @@ export default {
           tableName: '报价信息表',
           columnProp: 'createBy',
           headerAlign: 'center',
-          align: 'center',
+          align: 'left',
           columnLabel: '创建人',
           columnHidden: false,
           columnImage: false,
@@ -485,30 +508,12 @@ export default {
         this.$message.warning("请选择需报价的单号")
         return
       }
-      let batchInsertList = this.quotationSelections.map(item=>{
-        let insertData = {
-          site:this.$store.state.user.site,
-          quotationNo:"",//客户报价单号
-          quotationDate:new Date(),//报价日期
-          customerNo:item.customerNo, // 客户编号
-          customerName:item.customerDesc,//客户名称
-          versionCode:"001",
-          projectId:item.projectId,//项目编码
-          projectName:item.projectName,//项目名称
-          tracker:item.tracker,//跟单员
-          currency:item.customerCurrency,//货币
-          quotationStatus:"草稿",//状态
-          remark:"",//备注
-          customerInquiryNo:"",//客户询价单号
-          internalInquiryNo:item.quotationNo,//内部询价单号
-          requireApproval:"",//需要审批
-          approvalStatus:"",//审批状态
-          createBy:this.$store.state.user.id,//当前登录账号
-          createTime:new Date(),//当前时间
-        };
-        return insertData;
+      this.quotationSelections = this.quotationSelections.map(item=>{
+        item.createBy = this.$store.state.user.id
+        item.site = this.$store.state.user.site
+        return item;
       })
-      this.saveBatchQuotationHeader(batchInsertList);
+      this.saveBatchQuotationHeader(this.quotationSelections);
     },
     // 批量新增报价信息
     saveBatchQuotationHeader(list){
@@ -518,7 +523,7 @@ export default {
         if (data.code === 200){
           this.$message.success(data.msg);
           this.$refs.quotationTable.clearSelection();
-          this.getDataList();
+          this.$router.push({name:"quotation-sellForQuotation",params:{ids:data.data},})
         }else {
           this.$message.error(data.msg);
         }
@@ -528,6 +533,7 @@ export default {
     },
   },
   mounted() {
+
   },
 }