Merge remote-tracking branch 'origin/master'

src/views/modules/eam/eamProjectPartInfo.vue

@@ -2652,7 +2652,6 @@ import {EventBus} from "../../../main";
             finalPartNo: this.modalData.finalPartNo,
           }
           getFinalPartDesc(inData).then(({data}) => {
-            console.log(data)
             if (data && data.code === 0) {
               if (data.data !== null) {
                 this.modalData.finalPartDesc = data.data.finalPartDesc

src/views/modules/part/bomManagement.vue

@@ -530,7 +530,7 @@
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="modalData" style="margin-left: 7px;margin-top: -5px;">
-          <el-form-item label="Bom版本号">
+          <el-form-item label="BOM版本号">
             <el-input v-model="modalData.engChgLevel" readonly style="width: 185px"></el-input>
           </el-form-item>
           <el-form-item label="制造类型">
@@ -578,7 +578,7 @@
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="copyBomData" style="margin-left: 7px;margin-top: -5px;">
-          <el-form-item label="Bom版本号">
+          <el-form-item label="BOM版本号">
             <el-input v-model="copyBomData.engChgLevel" style="width: 185px"></el-input>
           </el-form-item>
           <el-form-item label="制造类型">
@@ -618,7 +618,7 @@
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="detailData" style="margin-left: 7px;margin-top: -5px;">
-          <el-form-item label="Bom版本号">
+          <el-form-item label="BOM版本号">
             <el-input v-model="detailData.engChgLevel" readonly style="width: 185px"></el-input>
           </el-form-item>
           <el-form-item label="制造类型">
@@ -645,7 +645,7 @@
           </el-form-item>
         </el-form>
         <el-form :inline="true" label-position="top" :model="copyAlternativeData" style="margin-left: 7px;margin-top: -5px;">
-          <el-form-item label="Bom版本号">
+          <el-form-item label="BOM版本号">
             <el-input v-model="copyAlternativeData.engChgLevel" style="width: 185px"></el-input>
           </el-form-item>
           <el-form-item label="制造类型">

src/views/modules/part/routingManagement.vue

@@ -355,7 +355,8 @@
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
         <el-form-item style="margin-left: 235px" prop="setupLaborClassNo">
           <span style="cursor: pointer" slot="label" @click="getBaseList(217, 2)"><a herf="#">调机过程中人员等级</a></span>
-          <el-input v-model="componentData.setupLaborClassDesc" readonly style="width: 221px"></el-input>
+          <el-input v-model="componentData.setupLaborClassNo" @blur="setupLaborClassBlur(217)" style="width: 70px"></el-input>
+          <el-input v-model="componentData.setupLaborClassDesc" disabled style="width: 148px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
@@ -381,7 +382,8 @@
         </el-form-item>
         <el-form-item prop="laborClassNo">
           <span style="cursor: pointer" slot="label" @click="getBaseList(217, 1)"><a herf="#">人员等级</a></span>
-          <el-input v-model="componentData.laborClassDesc" readonly style="width: 221px"></el-input>
+          <el-input v-model="componentData.laborClassNo" @blur="laborClassBlur(217)" style="width: 70px"></el-input>
+          <el-input v-model="componentData.laborClassDesc" disabled style="width: 148px"></el-input>
         </el-form-item>
       </el-form>
       <el-form :inline="true" label-position="top" :model="componentData" :rules="componentRules" style="margin-left: 5px">
@@ -637,8 +639,8 @@ export default {
       deep: true,
       handler: function (newV, oldV) {
         this.componentData.workCenterNo = this.componentData.workCenterNo.toUpperCase()
-        this.componentData.laborClassDesc = this.componentData.laborClassDesc.toUpperCase()
-        this.componentData.setupLaborClassDesc = this.componentData.setupLaborClassDesc.toUpperCase()
+        this.componentData.laborClassNo = this.componentData.laborClassNo.toUpperCase()
+        this.componentData.setupLaborClassNo = this.componentData.setupLaborClassNo.toUpperCase()
       }
     },
   },
@@ -2829,6 +2831,54 @@ export default {
       }
     },
 
+    // 人员等级
+    setupLaborClassBlur (tagNo) {
+      if (this.componentData.setupLaborClassNo != null && this.componentData.setupLaborClassNo !== '') {
+        let tempData = {
+          tagno: tagNo,
+          conditionSql: " and class_no = '" + this.componentData.setupLaborClassNo + "'" + " and site  = '" + this.modalData.site + "'" + " and bu_no  = '" + this.modalData.buNo + "'"
+        }
+        verifyData(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            if (data.baseListData.length > 0) {
+              this.componentData.setupLaborClassNo = data.baseListData[0].class_no
+              this.componentData.setupLaborClassDesc = data.baseListData[0].class_desc
+            } else {
+              this.$message.warning('该人员等级不存在！')
+              this.componentData.setupLaborClassDesc = ''
+            }
+          } else {
+            this.$message.warning(data.msg)
+            this.componentData.setupLaborClassDesc = ''
+          }
+        })
+      }
+    },
+
+    // 人员等级
+    laborClassBlur (tagNo) {
+      if (this.componentData.laborClassNo != null && this.componentData.laborClassNo !== '') {
+        let tempData = {
+          tagno: tagNo,
+          conditionSql: " and class_no = '" + this.componentData.laborClassNo + "'" + " and site  = '" + this.modalData.site + "'" + " and bu_no  = '" + this.modalData.buNo + "'"
+        }
+        verifyData(tempData).then(({data}) => {
+          if (data && data.code === 0) {
+            if (data.baseListData.length > 0) {
+              this.componentData.laborClassNo = data.baseListData[0].class_no
+              this.componentData.laborClassDesc = data.baseListData[0].class_desc
+            } else {
+              this.$message.warning('该人员等级不存在！')
+              this.componentData.laborClassDesc = ''
+            }
+          } else {
+            this.$message.warning(data.msg)
+            this.componentData.laborClassDesc = ''
+          }
+        })
+      }
+    },
+
     // ======== 导出相关方法 ========
     /**
      * 导出excel

src/views/modules/quote/priceCheckProperties.vue

@@ -10,6 +10,7 @@ import {
 import TransferTable from "../common/transferTable.vue";
 
 export default {
+  height: 200,
   name: "priceCheckProperties",
   components: {TransferTable},
   props:{
@@ -187,7 +188,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       /*第二个表格高度的动态调整*/
-      this.secondHeight = window.innerHeight -this.height;
+      this.height = window.innerHeight - 210;
     })
   },
 
@@ -320,7 +321,7 @@ export default {
     </div>
     <div class="rq" v-if="attributeDialog" style="height: 100%">
       <el-table
-        :height="this.height + 30"
+        :height="this.height - 280"
         :data="dataList"
         border
         style="width: 100%;margin-top: 5px">
@@ -348,7 +349,7 @@ export default {
     </div>
     <div class="rq" v-else style="height: 100%">
       <el-table
-        :height="this.height +30"
+        :height="this.height - 60"
         :data="copyAttributeList"
         border
         style="width: 100%;margin-top: 5px">

src/views/modules/quote/requestForQuote.vue

@@ -97,7 +97,7 @@
 
     <!-- 询价列表 -->
     <el-table
-      :height="this.height - 30"
+      :height="this.height - 300"
       :data="dataList"
       border
       :row-style="rowStyle"
@@ -106,7 +106,7 @@
       @selection-change="selectionQuotation"
       @current-change="changeCurrentRow"
       v-loading="dataListLoading"
-      style="width: 100%;">
+      style="width: 100%;margin-top: 5px">
       <el-table-column
         type="selection"
         header-align="center"
@@ -181,7 +181,7 @@
               <span style="cursor: pointer" slot="label" v-if="modalData.flag === '1'" @click="getBaseList(509,1)"><a herf="#">客户编码</a></span>
               <el-row :gutter="10">
                 <el-col :span="8">
-                  <el-input :disabled="modalData.flag !== '1'" v-model="modalData.customerNo"></el-input>
+                  <el-input :disabled="modalData.flag !== '1'" v-model="modalData.customerNo" @blur="customerNoBlur"></el-input>
                 </el-col>
                 <el-col :span="16">
                   <el-input disabled v-model="modalData.customerDesc"></el-input>
@@ -219,7 +219,7 @@
               <el-row :gutter="10">
                 <el-col :span="8">
                   <el-input :disabled="!modalData.customerNo || modalData.flag !== '1'"
-                            v-model="modalData.projectNo"></el-input>
+                            v-model="modalData.projectNo" @blur="projectNoBlur"></el-input>
                 </el-col>
                 <el-col :span="16">
                   <el-input disabled v-model="modalData.projectDesc"></el-input>
@@ -623,7 +623,7 @@
                                 :quotation-no="quotationCurrentRow.quotationNo"></price-check-properties>
       </el-tab-pane>
       <!-- 项目信息页签 -->
-      <el-tab-pane label="项目信息" name="project_information" style="height: 166px">
+      <el-tab-pane label="项目信息" name="project_information" style="height: 272px">
         <el-form label-position="top" :model="projectInformationData"
                  style="margin-left: 10px;margin-top: 5px;margin-right: 10px;">
           <el-row :gutter="20">
@@ -941,6 +941,8 @@ import {getPriceCheckPropertiesList} from "../../../api/quote/priceCheckProperti
 import * as XLSX from 'xlsx';
 import priceCheckProperties from "./priceCheckProperties.vue";
 import quotationUpload from "../quote/quotation_upload.vue";
+import {queryCustomerList} from "../../../api/customer/customer";
+import {queryProjectList} from "../../../api/project/project";
 
 export default {
   computed: {
@@ -1147,6 +1149,8 @@ export default {
         rejectFlag: '',
         rejectStepId: '',
         isReject: '',
+        projectManager: '',
+        projectOwner: '',
         projectPartIds: []
       },
       quotationDetailData: {
@@ -2251,7 +2255,7 @@ export default {
   mounted() {
     this.$nextTick(() => {
       /*第二个表格高度的动态调整*/
-      this.secondHeight = window.innerHeight -this.height;
+      this.height = window.innerHeight - 210;
     })
   },
   created() {
@@ -3188,6 +3192,57 @@ export default {
       // }
     },
 
+    customerNoBlur(){
+      let params = {
+        customerNo: this.modalData.customerNo,
+        createBy: this.$store.state.user.name,
+      }
+      queryCustomerList(params).then(({data}) => {
+        if (data && data.code === 0) {
+          if (data.rows.length === 1){
+            this.modalData.customerDesc = data.rows[0].customerDesc
+          }else {
+            this.modalData.projectNo = ''
+            this.modalData.projectDesc = ''
+            this.modalData.customerDesc = ''
+          }
+        }else {
+          this.$message.warning(data.message)
+        }
+      }).catch((error) => {
+        this.$message.error(error)
+      })
+    },
+    projectNoBlur(){
+      let params = {
+        projectNo: this.modalData.projectNo,
+        customerNo: this.modalData.customerNo,
+        createBy: this.$store.state.user.name,
+        buId: this.modalData.buId,
+      }
+      queryProjectList(params).then(({data})=>{
+        if (data && data.code === 0) {
+          if (data.rows.length === 1) {
+            this.modalData.projectDesc = data.rows[0].projectDesc
+            this.modalData.projectId = data.rows[0].projectId
+            this.modalData.finalCustomerId = data.rows[0].finalCustomerId
+            this.modalData.finalCustomerName = data.rows[0].finalCustomerName
+            this.modalData.projectManagerName = data.rows[0].projectManager.split('-')[1]
+            this.modalData.projectOwnerName = data.rows[0].projectOwner.split('-')[1]
+            this.getProjectPartList()
+          }else {
+            this.modalData.projectDesc = ''
+            this.modalData.finalCustomerId = ''
+            this.modalData.finalCustomerName = ''
+          }
+        }else {
+          this.$message.warning(data.msg)
+        }
+      }).catch((error)=>{
+        this.$message.error(error)
+      })
+    },
+
     // ======== 询价单附件的相关方法 ========
     /**
      * 获取询价单附件列表