Merge remote-tracking branch 'origin/master'

src/views/modules/srmSupplier/com_srmSupplier_Contract.vue

@@ -431,7 +431,7 @@ export default {
         contractDate:new Date(),
         validTo:'',
         amout:'',
-        currency:'',
+        currency:'USD',
         contractNo:'',
         contractName:'',
         contractDetail:'',

src/views/modules/srmSupplier/supplierList.vue

@@ -234,7 +234,7 @@
                 </el-form-item>
               </el-col>
               <el-col :span="6">
-                <el-form-item>
+                <el-form-item prop="planner">
                   <span style="cursor: pointer" slot="label" @click="getBaseList(530, 'planner')"><a href="#">Planner</a></span>
                   <el-input v-model="currentSupplier.planner" readonly style="width: 130px"></el-input>
                 </el-form-item>
@@ -1320,6 +1320,9 @@ export default {
         ],
         supplierDocType: [
           { required: true, message: '请选择供应商文档清单模板', trigger: ['blur', 'change'] }
+        ],
+        planner: [
+          { required: true, message: '请选择Planner', trigger: ['blur', 'change'] }
         ]
       }
     }
@@ -1501,6 +1504,10 @@ export default {
           if (currentType && this.supplierDocTypeOptions.indexOf(currentType) === -1) {
             this.supplierDocTypeOptions.unshift(currentType)
           }
+          // 新增弹窗打开时，供应商文档清单模板默认选中第一条
+          if (this.isAdd && !this.currentSupplier.supplierDocType && this.supplierDocTypeOptions.length > 0) {
+            this.currentSupplier.supplierDocType = this.supplierDocTypeOptions[0]
+          }
         } else {
           this.supplierDocTypeOptions = []
           this.$message.error((data && data.msg) || '加载供应商文档清单失败')

src/views/modules/supplier/purPartAssign.vue

@@ -75,7 +75,7 @@
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item required>
-              <span style="cursor:pointer" slot="label" @click="getBaseList(2017)"><a href="javascript:void(0)">正式料号</a></span>
+              <span style="cursor:pointer" slot="label" @click="getBaseList(531)"><a href="javascript:void(0)">正式料号</a></span>
               <el-input v-model="assignForm.partNo" placeholder="请选择正式料号" readonly />
             </el-form-item>
           </el-col>
@@ -217,7 +217,7 @@ export default {
       })
     },
     getBaseData(val) {
-      if (this.tagNo === 2017) {
+      if (this.tagNo === 531) {
         this.assignForm.partNo = val.part_no
         this.assignForm.partDesc = val.part_desc
       }

src/views/modules/supplier/supPurReplyHistList.vue

@@ -45,7 +45,7 @@
     </el-form>
 
     <!-- 列表 -->
-    <el-table :data="dataList" :height="height" border ref="mainTable" highlight-current-row v-loading="loading" style="width:100%" stripe>
+    <el-table :data="dataList" :height="height" border ref="mainTable" highlight-current-row v-loading="loading" style="width:100%" stripe @current-change="handleCurrentChange">
       <el-table-column fixed="right" :label="'操作'" header-align="center" align="center" width="120">
         <template slot-scope="scope">
           <el-link style="cursor: pointer" v-if="scope.row.status === '已报价'" @click="openDialog(scope.row)">审批 </el-link>
@@ -728,6 +728,12 @@ export default {
     window.removeEventListener('resize', this.calcHeight)
   },
   methods: {
+    handleCurrentChange(row) {
+      if (!row) return
+      // 避免与 getList 里的默认选中重复触发（可选，用 id 判断）
+      if (this.currentRow && this.currentRow.id === row.id) return
+      this.changeData(row)
+    },
     formalPartNo(row) {
       return formatFormalPartNo(row)
     },