Merge remote-tracking branch 'origin/master'

src/views/modules/ecss/del_upload_excel.vue

@@ -11,6 +11,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item :label="'国家'" >
+              <el-input v-model="pageData.cnative"></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item :label="''" >
               <template #label>
@@ -18,45 +23,46 @@
                   <a href="#" @click="customFlag=true">客户</a>
                 </span>
               </template>
-              <el-input v-model="pageData.customerName" ></el-input>
+              <el-input type="textarea"
+                        :rows="2" v-model="pageData.customerName" ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item :label="''" >
               <template #label>
                 <span slot="label" style="" class="big-label">
-                  <a href="#" @click="localShipAddressFlag=true">客户地址</a>
+                  <a href="#" @click="overseasShipperFlag=true">收货单位</a>
                 </span>
               </template>
-              <el-input v-model="pageData.localShipAddress" ></el-input>
+              <el-input type="textarea"
+                        :rows="2" v-model="pageData.overseasShipper" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+
+          <el-col :span="12" style="margin-top: 30px">
             <el-form-item :label="''" >
               <template #label>
                 <span slot="label" style="" class="big-label">
-                  <a href="#" @click="overseasShipperFlag=true">收货人</a>
+                  <a href="#" @click="localShipAddressFlag=true">客户地址</a>
                 </span>
               </template>
-              <el-input v-model="pageData.overseasShipper" ></el-input>
+              <el-input type="textarea"
+                        :rows="3" v-model="pageData.localShipAddress" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+
+          <el-col :span="12" style="margin-top: 30px">
             <el-form-item :label="''" >
               <template #label>
                 <span slot="label" style="" class="big-label">
-                  <a href="#" @click="overseasAddressFlag=true">收货人地址</a>
+                  <a href="#" @click="overseasAddressFlag=true">收货单位地址</a>
                 </span>
               </template>
-              <el-input v-model="pageData.overseasAddress" ></el-input>
+              <el-input type="textarea"
+                        :rows="3" v-model="pageData.overseasAddress" ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item :label="'籍贯'" >
-              <el-input v-model="pageData.cnative"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
+          <el-col :span="24" style="margin-top: 30px">
           <el-form-item label=" ">
             <el-button type="primary" @click="downloadFile()">下载文件模板</el-button>
           </el-form-item> </el-col>
@@ -125,7 +131,7 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="收货人地址" @close="overseasAddressFlag = false" :visible.sync="overseasAddressFlag" width="500px" v-drag>
+    <el-dialog title="收货单位地址" @close="overseasAddressFlag = false" :visible.sync="overseasAddressFlag" width="500px" v-drag>
       <el-table
         :height="400"
         :data="customerAddrs"
@@ -138,7 +144,7 @@
           prop="cDeliverAdd"
           header-align="center"
           align="left"
-          label="收货人地址">
+          label="收货单位地址">
         </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -146,20 +152,26 @@
       </el-footer>
     </el-dialog>
 
-    <el-dialog title="收货人" @close="overseasShipperFlag = false" :visible.sync="overseasShipperFlag" width="500px" v-drag>
+    <el-dialog title="收货单位" @close="overseasShipperFlag = false" :visible.sync="overseasShipperFlag" width="500px" v-drag>
       <el-table
         :height="400"
-        :data="customerPersons"
+        :data="customerAddrs"
         stripe
         highlight-current-row
         border
         @row-dblclick="rowDblclick4"
         style="width: 100%;">
         <el-table-column
-          prop="ccontactname"
+          prop="cDeliverUnit"
+          header-align="left"
+          align="left"
+          label="收货单位">
+        </el-table-column>
+        <el-table-column
+          prop="country"
           header-align="center"
           align="left"
-          label="收货人">
+          label="国家">
         </el-table-column>
       </el-table>
       <el-footer style="height:40px;margin-top: 10px;text-align:center">
@@ -287,8 +299,8 @@
         this.overseasAddressFlag = false
       },
       rowDblclick4 (row) {
-        this.pageData.overseasShipper=row.ccontactname
-        this.setCnative()
+        this.pageData.overseasShipper=row.cDeliverUnit
+        this.pageData.cnative=row.country
         this.overseasShipperFlag = false
       },
 
@@ -336,15 +348,15 @@
           return false
         }
         if (null == this.pageData.overseasShipper || this.pageData.overseasShipper=='') {
-          this.$message.error("请先填写收货人!")
+          this.$message.error("请先填写收货单位!")
           return false
         }
         if (null == this.pageData.overseasAddress || this.pageData.overseasAddress=='') {
-          this.$message.error("请先填写收货人地址!")
+          this.$message.error("请先填写收货单位地址!")
           return false
         }
         if (null == this.pageData.cnative || this.pageData.cnative=='') {
-          this.$message.error("请先填写收货人籍贯!")
+          this.$message.error("请先填写收货单位国家!")
           return false
         }
         // 判断文件是否上传

src/views/modules/inquiry/inquiryTechnicalMaterialsNoBuilt.vue

@@ -87,7 +87,7 @@
       </el-form-item>
       <el-form-item :label="' '">
         <el-button @click="getDataList()">查询</el-button>
-        <el-button type="primary" @click="addModal()">新增</el-button>
+<!--        <el-button type="primary" @click="addModal()">新增</el-button>-->
         <el-button type="primary" icon="el-icon-upload" @click="handleImportQuotation()">导入</el-button>
         <download-excel
           :fields="fields()"

src/views/modules/part/part_create.vue

@@ -797,6 +797,8 @@ import {getSiteAndBuByUserName} from "@/api/qc/qc.js"
 import {deleteObjectFile} from '@/api/eam/eam.js'
 import Chooselist from '@/views/modules/common/Chooselist_eam'
 import partUploadFile from "./part_upload_file"
+import {updateInquiryDetailStatusAndPart} from "../../../api/inquiry/inquiryDetail";
+import {EventBus} from "../../../main";
 export default {
   name: 'partCreate',
   components: {
@@ -811,6 +813,12 @@ export default {
       }
     },
   },
+  props: {
+    initData:{
+      type: Object,
+      requester: true
+    }
+  },
   data() {
     return {
       userBuList: [],
@@ -866,7 +874,12 @@ export default {
         codeDesc: '',
         tblBaseFlag: '',
         templateNo: '',
-        templateName: ''
+        templateName: '',
+        id: '',
+        testPartId: '',
+        testPartDesc: '',
+        partBomStatus: '',
+        updateBy: ''
       },
       itemData: {
         site: this.$store.state.user.site,
@@ -1970,6 +1983,11 @@ export default {
   created () {
     // 获取用户的 site 和 bu
     this.getSiteAndBuByUserName()
+    this.modalData.id = this.initData.id
+    this.modalData.testPartId = this.initData.testPartId
+    this.modalData.testPartDesc = this.initData.testPartDesc
+    this.modalData.partBomStatus = this.initData.partBomStatus
+    this.modalData.updateBy = this.$store.state.user.name
   },
 
   methods: {
@@ -2157,7 +2175,6 @@ export default {
         return
       }
       this.saveLoading = true
-      console.log(this.modalData)
       if (this.modalData.flag === '1') {
         savePartInfo(this.modalData).then(({data}) => {
           if (data && data.code === 0) {
@@ -2237,6 +2254,8 @@ export default {
           this.saveLoading = false
         })
       }
+      EventBus.$emit('refreshInquiryOneDetail1')
+      EventBus.$emit('refreshInquiryOneDetail2')
     },
 
     // 列表表格选择替换

src/views/modules/part/quicklyCreateBom.vue

@@ -151,7 +151,7 @@
     </el-dialog>
 
     <!-- 新增物料 -->
-    <part-create ref="PartCreate" @refreshPageTables="getBomInfo" @refreshPageTables2="getInfoByBomTemplate" v-drag></part-create>
+    <part-create :init-data="searchData" ref="PartCreate" @refreshPageTables="getBomInfo" @refreshPageTables2="getInfoByBomTemplate" v-drag></part-create>
 
     <!-- chooseList模态框 -->
     <ChooseList ref="baseList" @getBaseData="getBaseData"></ChooseList>

src/views/modules/quote/detail/quoteDetail.vue

@@ -697,7 +697,6 @@ export default {
       this.saveVisible = false
     },
     getHeaderStyle({ column }) {
-      console.log('1',column + '' + this.authFlag)
       if (!this.authFlag) {
         return {};
       }
@@ -739,7 +738,6 @@ export default {
       }
     },
     'quoteGroupDetail.currentQuoteDetailItemNo'(newVal,oldVal){
-      // console.log(this.quoteGroupDetail)
       // emit事件触发修改
       if (this.quoteGroupDetail && newVal){
         this.$emit('currentQuoteDetailItemNo',oldVal);