2025-04-27

src/views/modules/quotation/requestForQuote.vue

@@ -253,13 +253,13 @@
           </el-col>
         </el-row>
         <el-row :gutter="10">
-          <el-col :span="12">
+          <el-col :span="8">
             <el-form-item label="终端客户编码">
               <el-row :gutter="10">
-                <el-col :span="8">
+                <el-col :span="12">
                   <el-input disabled v-model="modalData.finalCustomerId"></el-input>
                 </el-col>
-                <el-col :span="16">
+                <el-col :span="12">
                   <el-input disabled v-model="modalData.finalCustomerName"></el-input>
                 </el-col>
               </el-row>
@@ -271,6 +271,11 @@
                                 clearable dict-type="delivery_terms" :use-default-value="modalData.flag === '1'"></dict-data-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="place" prop="place">
+              <el-input v-model="modalData.place" :disabled="(quotationInformationFlag('place') === 'N' && modalData.flag === '2') || detailVisible" clearable></el-input>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item prop="quoterName">
               <span v-if="(quotationInformationFlag('quoter') === 'N' && modalData.flag === '2') || detailVisible" slot="label">报价专员</span>
@@ -2385,7 +2390,8 @@ export default {
         confirmInformation: '',
         quotationResultStatus: 'B',
         createBy: this.$store.state.user.name,
-        nodeId: ''
+        nodeId: '',
+        place:'',
       }
       this.modalDisableFlag = false
       this.modalFlag = true
@@ -2445,6 +2451,7 @@ export default {
         isReject: row.isReject,
         nodeId: row.nodeId,
         approvalUsername: row.approvalUsername,
+        place: row.place,
       }
       if (this.modalData.flag !== '1'){
         this.projectPartData.testPartNo = this.modalData.testPartNo

src/views/modules/sampleManagement/technicalSpecificationList.vue

@@ -1025,8 +1025,8 @@
         technicalSpecificationListSearch(this.searchData).then(({data}) => {
           if (data && data.code === 0) {
             this.dataList1 = data.page.list
-            this.pageIndex = data.page.currPage
-            this.pageSize = data.page.pageSize
+            // this.pageIndex = data.page.currPage
+            // this.pageSize = data.page.pageSize
             this.totalPage = data.page.totalCount
             if(this.dataList1.length>0){
               this.$refs.mainTable.setCurrentRow(this.dataList1[0]);

src/views/modules/test/requestForTest.vue

@@ -241,6 +241,11 @@
               <el-input :disabled="(testInformationFlag('productName') === 'N' && modalData.flag === '2') || detailFlag" v-model="modalData.productName"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="So Number" prop="soNumber">
+              <el-input :disabled="(testInformationFlag('soNumber') === 'N' && modalData.flag === '2') || detailFlag" v-model="modalData.soNumber"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row :gutter="15">
           <el-col :span="8">
@@ -1105,7 +1110,8 @@
           rejectFlag: '',
           rejectStepId: '',
           isReject: '',
-          nodeId: ''
+          nodeId: '',
+          soNumber:'',
         },
         testDetailData: {
           technicalConsiderations: '',
@@ -2544,6 +2550,7 @@
           isReject: row.isReject,
           nodeId: row.nodeId,
           approvalUsername: row.approvalUsername,
+          soNumber: row.soNumber,
         }
         this.activeTabList = ['product','process','attribute','partAttribute','file']
         // this.$nextTick(()=>{

src/views/modules/tooling/manuf_tool.vue

@@ -85,10 +85,10 @@
       layout="total, sizes, prev, pager, next, jumper">
     </el-pagination>
     <el-tabs style="font-size: 12px;min-height: 330px" class="customer-tab" v-model="activeName"  type="border-card"  @tab-click="tabClick">
-      <el-tab-pane label="工具实例" name="detail" style="margin-left: 0px;">
-        <el-form label-position="top" style="margin-top: 5px; margin-left: 5px;">
+      <el-tab-pane label="工具实例" name="detail">
+        <div style="padding: 5px 0 0 5px">
           <el-button type="primary" @click="addToolInstanceModal()">新增</el-button>
-        </el-form>
+        </div>
         <el-table
           :data="detailList"
           height="240"
@@ -548,7 +548,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 90
+          columnWidth: 120
         },
         {
           userId: this.$store.state.user.name,
@@ -566,7 +566,7 @@ export default {
           sortLv: 0,
           status: true,
           fixed: '',
-          columnWidth: 70
+          columnWidth: 160
         },
         {
           userId: this.$store.state.user.name,