feat(erp-plat): add '往来单位' field to forms and tables for better data representation

- Introduced a new field for '往来单位' in various forms and tables to enhance data visibility. - Updated the backend service to support fetching and displaying '往来单位' names based on the corresponding IDs. - Ensured consistent layout and structure across forms and tables for improved user experience. - Removed unnecessary fields related to '制单人' to streamline the forms. Made-with: Cursor

feat(erp-plat): add '往来单位' field to forms and tables for better data representation
- Introduced a new field for '往来单位' in various forms and tables to enhance data visibility. - Updated the backend service to support fetching and displaying '往来单位' names based on the corresponding IDs. - Ensured consistent layout and structure across forms and tables for improved user experience. - Removed unnecessary fields related to '制单人' to streamline the forms. Made-with: Cursor
“wangming”
1 parent 44ba74bd
Showing 9 changed files with 179 additions and 206 deletions
Antis.Erp.Plat/.cursor/rules/project_rules.mdc
Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/Form.vue
Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgrkd/index.vue
Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/Form.vue
Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/detail-view.vue
Antis.Erp.Plat/antis-ncc-admin/src/views/wtCgthd/index.vue
Antis.Erp.Plat/antis-ncc-admin/src/views/wtProductSummary/index.vue
Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend.Entitys/Dto/WtXsckdInfoOutput.cs
Antis.Erp.Plat/netcore/src/Modularity/Extend/NCC.Extend/WtXsckdService.cs
@@ -51,6 +51,7 @@ alwaysApply: true
 - **图标显示**: 所有列表数据都要有图标，不同颜色区分类型
 - **空值显示**: 没有信息的字段显示"无"
 - **列表规范**: 列表数据不能换行
+- **列表/报表页头部搜索区**: 须与标准业务列表页排版一致——`NCC-common-layout` → `NCC-common-layout-center` → `el-row` 使用 class `NCC-common-search-box`（建议 `:gutter="16"`）；内层 `el-form` 使用 `@submit.native.prevent`（与其它列表一致，**不要**在表单上单独套一套与 `wtXsckd` / `wtCgthd` 等常规列表差异过大的自定义外层布局）；筛选项默认 `el-col :span="6"`，末列放置「查询」「重置」「展开/收起」；新增或改造带搜索的页面时优先对照上述列表页复制结构再改字段。
 ### 性能要求
 - 启用懒加载和代码分割
@@ -169,12 +169,6 @@
 							</el-input>
 						</el-form-item>
 					</el-col>
-					<el-col :span="8" v-if="false">
-						<el-form-item label="制单人" prop="zdr">
-							<user-select v-model="dataForm.zdr" placeholder="请选择" clearable disabled >
-							</user-select>
-						</el-form-item>
-					</el-col>
 					<el-col :span="8">
 						<el-form-item label="审核人" prop="shr">
 							<user-select v-model="dataForm.shr" placeholder="请选择" clearable disabled >
@@ -235,7 +229,6 @@
 					ysje:undefined,
 					skzh:undefined,
 					skje:undefined,
-					zdr:undefined,
 					shr:undefined,
 					gzr:undefined,
 					bz:undefined,
@@ -40,11 +40,6 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="6">
-						<el-form-item label="制单人">
-							<userSelect v-model="query.zdr" placeholder="请选择制单人" />
-						</el-form-item>
-					</el-col>
-					<el-col :span="6">
 						<el-form-item label="审核人">
 							<userSelect v-model="query.shr" placeholder="请选择审核人" />
 						</el-form-item>
@@ -100,7 +95,6 @@
 							<template slot-scope="scope">{{ scope.row.skzh | dynamicText(skzhOptions) }}</template>
 					</el-table-column>
 					<el-table-column prop="skje" label="付款金额" align="left" />
-					<el-table-column prop="zdr" label="制单人" align="left" />
 					<el-table-column prop="shr" label="审核人" align="left">
 						<template slot-scope="scope">{{ getShrDisplay(scope.row) }}</template>
 					</el-table-column>
@@ -163,7 +157,6 @@
                     jsr:undefined,
                     skzh:undefined,
                     skje:undefined,
-                    zdr:undefined,
                     shr:undefined,
                     gzr:undefined,
                     bz:undefined,
@@ -188,7 +181,6 @@
                     { prop: 'jsr', label: '经手人' },
                     { prop: 'skzh', label: '付款账户' },
                     { prop: 'skje', label: '付款金额' },
-                    { prop: 'zdr', label: '制单人' },
                     { prop: 'shr', label: '审核人' },
                     { prop: 'gzr', label: '过账人' },
                     { prop: 'bz', label: '备注' },
@@ -27,6 +27,13 @@
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
+						<el-form-item label="往来单位" prop="gys">
+							<el-select v-model="dataForm.gys" placeholder="请选择或调原入库单带出" clearable :style='{"width":"100%"}' filterable :disabled="!!isDetail">
+								<el-option v-for="(item, index) in gysOptions" :key="index" :label="item.dwmc" :value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="12">
 						<el-form-item label="原采购入库单">
 							<el-button type="primary" icon="el-icon-search" @click="openPurchaseInboundOrderSelect">
 								调原入库单
@@ -264,9 +271,11 @@
 					gzr:undefined,
 					bz:undefined,
 					djlx:"采购退货单",
+					gys: undefined,
 				},
 				rules: {
 				},
+				gysOptions: [],
 				cjckOptions : [],
 				rkckOptions : [],
 				rkckOptions : [],
@@ -295,6 +304,7 @@
 			this.getckckOptions();
 			this.getspbhOptions();
 			this.getskzhOptions();
+			this.getgysOptions();
 			// 设置单据日期默认为当前日期，经手人默认为当前用户
 			if (!this.dataForm.id) {
 				this.dataForm.djrq = Date.now();
@@ -337,6 +347,16 @@
 					this.skzhOptions = res.data.list
 				});
 			},
+			getgysOptions() {
+				return request({
+					url: '/api/Extend/WtWldw',
+					method: 'get',
+					data: { pageSize: 1000, currentPage: 1 }
+				}).then(res => {
+					this.gysOptions = (res.data && res.data.list) ? res.data.list : (res.data || [])
+					return res
+				})
+			},
 			goBack() {
                 this.$emit('refresh')
             },
@@ -354,6 +374,9 @@
 					if (mainTableInfo && mainTableInfo.rkck) {
 						this.dataForm.cjck = mainTableInfo.rkck
 					}
+					if (mainTableInfo && mainTableInfo.gys) {
+						this.dataForm.gys = mainTableInfo.gys
+					}
 					for (const detail of inboundDetails) {
 						const qty = parseFloat(detail.sl) || 0
 						const price = parseFloat(detail.dj) || 0
@@ -404,6 +427,9 @@
 						method: 'get'
 					}).then(res =>{
 						this.dataForm = res.data;
+						if (res.data.gysId != null && res.data.gysId !== '') {
+							this.$set(this.dataForm, 'gys', res.data.gysId);
+						}
 						if (!this.dataForm.wtXsckdMxList) {
 							this.dataForm.wtXsckdMxList = [];
 						}
@@ -61,6 +61,12 @@
 							{{ cellText(detail.jsr) }}
 						</span>
 					</el-descriptions-item>
+					<el-descriptions-item label="往来单位">
+						<span class="cell-nowrap">
+							<i class="el-icon-office-building desc-icon desc-icon--info" />
+							{{ cellText(detail.gys) }}
+						</span>
+					</el-descriptions-item>
 				</el-descriptions>
 				<div class="detail-section-head">
@@ -23,6 +23,13 @@
 					</el-col>
 					<template v-if="showAll">
 					<el-col :span="6">
+						<el-form-item label="往来单位">
+							<el-select v-model="query.gys" placeholder="请选择" clearable filterable style="width: 100%">
+								<el-option v-for="item in gysOptions" :key="item.id" :label="item.dwmc" :value="item.id" />
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :span="6">
 						<el-form-item label="经手人">
 							<userSelect v-model="query.jsr" placeholder="请选择经手人" />
 						</el-form-item>
@@ -101,6 +108,11 @@
 							<template slot-scope="scope">{{ scope.row.cjck | dynamicText(cjckOptions) }}</template>
 					</el-table-column>
 					<el-table-column prop="jsr" label="经手人" align="left" />
+					<el-table-column prop="gys" label="往来单位" align="left" min-width="120" show-overflow-tooltip>
+						<template slot-scope="scope">
+							<span class="cell-nowrap">{{ scope.row.gys || '无' }}</span>
+						</template>
+					</el-table-column>
 					<!-- <el-table-column prop="ysje" label="优惠金额" align="left" /> -->
 					<el-table-column label="退款账户" prop="skzh" align="left">
 							<template slot-scope="scope">{{ scope.row.skzh | dynamicText(skzhOptions) }}</template>
@@ -157,6 +169,7 @@
                     gzr:undefined,
                     bz:undefined,
                     djlx:undefined,
+                    gys: undefined,
 				},
                 list: [],
                 listLoading: true,
@@ -175,6 +188,7 @@
                     { prop: 'djrq', label: '单据日期' },
                     { prop: 'cjck', label: '出库仓库' },
                     { prop: 'jsr', label: '经手人' },
+                    { prop: 'gys', label: '往来单位' },
                     // { prop: 'ysje', label: '优惠金额' },
                     { prop: 'skzh', label: '退款账户' },
                     { prop: 'skje', label: '退款金额' },
@@ -188,6 +202,7 @@
 				cjckOptions : [],
 				rkckOptions : [],
 				skzhOptions : [],
+				gysOptions: [],
 			}
         },
 		computed: {},
@@ -196,6 +211,7 @@
 			this.getcjckOptions();
 			this.getrkckOptions();
 			this.getskzhOptions();
+			this.getgysOptions();
 		},
 		methods: {
 			getcjckOptions(){
@@ -213,6 +229,15 @@
 					this.skzhOptions = res.data.list
 				});
 			},
+			getgysOptions() {
+				request({
+					url: '/api/Extend/WtWldw',
+					method: 'get',
+					data: { pageSize: 1000, currentPage: 1 }
+				}).then(res => {
+					this.gysOptions = (res.data && res.data.list) ? res.data.list : (res.data || [])
+				})
+			},
 			initData() {
                 this.listLoading = true;
                 let _query = {
 <template>
-  <div class="NCC-common-layout product-summary-page">
+  <div class="NCC-common-layout">
     <div class="NCC-common-layout-center">
       <el-row class="NCC-common-search-box" :gutter="16">
-        <el-form @submit.native.prevent label-width="90px" label-position="right">
+        <el-form @submit.native.prevent>
           <el-col :span="6">
             <el-form-item label="查询日期">
               <el-date-picker
@@ -133,60 +133,12 @@
       </el-row>
       <div class="NCC-common-layout-main NCC-flex-main">
-        <el-row :gutter="16" class="product-summary-stats">
-          <el-col :xs="24" :sm="12" :md="6">
-            <div class="product-summary-stat-card product-summary-stat-card--blue">
-              <div class="product-summary-stat-card__inner">
-                <i class="el-icon-goods product-summary-stat-card__icon" aria-hidden="true" />
-                <div class="product-summary-stat-card__text">
-                  <div class="product-summary-stat-card__label">商品行数</div>
-                  <div class="product-summary-stat-card__value cell-nowrap">{{ summaryStats.rowCount }}</div>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="6">
-            <div class="product-summary-stat-card product-summary-stat-card--green">
-              <div class="product-summary-stat-card__inner">
-                <i class="el-icon-sell product-summary-stat-card__icon" aria-hidden="true" />
-                <div class="product-summary-stat-card__text">
-                  <div class="product-summary-stat-card__label">销售数量合计</div>
-                  <div class="product-summary-stat-card__value cell-nowrap">{{ summaryStats.totalQtyDisplay }}</div>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="6">
-            <div class="product-summary-stat-card product-summary-stat-card--orange">
-              <div class="product-summary-stat-card__inner">
-                <i class="el-icon-coin product-summary-stat-card__icon" aria-hidden="true" />
-                <div class="product-summary-stat-card__text">
-                  <div class="product-summary-stat-card__label">销售金额合计</div>
-                  <div class="product-summary-stat-card__value cell-nowrap">{{ summaryStats.salesAmountDisplay }}</div>
-                </div>
-              </div>
-            </div>
-          </el-col>
-          <el-col :xs="24" :sm="12" :md="6">
-            <div class="product-summary-stat-card product-summary-stat-card--red">
-              <div class="product-summary-stat-card__inner">
-                <i class="el-icon-data-analysis product-summary-stat-card__icon" aria-hidden="true" />
-                <div class="product-summary-stat-card__text">
-                  <div class="product-summary-stat-card__label">毛利合计</div>
-                  <div class="product-summary-stat-card__value cell-nowrap">{{ summaryStats.profitDisplay }}</div>
-                </div>
-              </div>
-            </div>
-          </el-col>
-        </el-row>
-
         <div class="NCC-common-head product-summary-head">
-          <div class="product-summary-head__left">
+          <div>
             <span class="product-summary-head__title">
               <i class="el-icon-document product-summary-head__title-icon" aria-hidden="true" />
               商品销售明细
             </span>
-            <span class="product-summary-head__hint">与下方列表同一筛选条件汇总</span>
           </div>
           <div class="NCC-common-head-right">
             <el-tooltip effect="dark" content="刷新" placement="top">
@@ -201,55 +153,55 @@
         </div>
         <NCC-table v-loading="listLoading" :data="list" class="product-summary-table">
-          <el-table-column prop="商品编号" label="商品编号" min-width="110" align="left" show-overflow-tooltip>
+          <el-table-column prop="商品编号" label="商品编号" min-width="110" align="left" show-overflow-tooltip sortable :sort-method="sortText('商品编号')">
             <template slot-scope="scope">{{ displayText(scope.row['商品编号']) }}</template>
           </el-table-column>
-          <el-table-column prop="商品名称" label="商品名称" min-width="160" align="left" show-overflow-tooltip>
+          <el-table-column prop="商品名称" label="商品名称" min-width="160" align="left" show-overflow-tooltip sortable :sort-method="sortText('商品名称')">
             <template slot-scope="scope">{{ displayText(scope.row['商品名称']) }}</template>
           </el-table-column>
-          <el-table-column prop="销售" label="销售" min-width="88" align="right" show-overflow-tooltip>
+          <el-table-column prop="销售" label="销售" min-width="88" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('销售')">
             <template slot-scope="scope">{{ formatNumber(scope.row['销售'], 4) }}</template>
           </el-table-column>
-          <el-table-column prop="单位" label="单位" min-width="72" align="center" show-overflow-tooltip>
+          <el-table-column prop="单位" label="单位" min-width="72" align="center" show-overflow-tooltip sortable :sort-method="sortText('单位')">
             <template slot-scope="scope">{{ displayText(scope.row['单位']) }}</template>
           </el-table-column>
-          <el-table-column prop="单价" label="单价" min-width="96" align="right" show-overflow-tooltip>
+          <el-table-column prop="单价" label="单价" min-width="96" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('单价')">
             <template slot-scope="scope">{{ formatNumber(scope.row['单价'], 4) }}</template>
           </el-table-column>
-          <el-table-column prop="折前销售金额" label="折前销售金额" min-width="120" align="right" show-overflow-tooltip>
+          <el-table-column prop="折前销售金额" label="折前销售金额" min-width="120" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('折前销售金额')">
             <template slot-scope="scope">{{ formatNumber(scope.row['折前销售金额'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="销售金额" label="销售金额" min-width="110" align="right" show-overflow-tooltip>
+          <el-table-column prop="销售金额" label="销售金额" min-width="110" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('销售金额')">
             <template slot-scope="scope">{{ formatNumber(scope.row['销售金额'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="成本单价" label="成本单价" min-width="96" align="right" show-overflow-tooltip>
+          <el-table-column prop="成本单价" label="成本单价" min-width="96" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('成本单价')">
             <template slot-scope="scope">{{ formatNumber(scope.row['成本单价'], 4) }}</template>
           </el-table-column>
-          <el-table-column prop="成本金额" label="成本金额" min-width="110" align="right" show-overflow-tooltip>
+          <el-table-column prop="成本金额" label="成本金额" min-width="110" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('成本金额')">
             <template slot-scope="scope">{{ formatNumber(scope.row['成本金额'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="费用分摊金额" label="费用分摊金额" min-width="120" align="right" show-overflow-tooltip>
+          <el-table-column prop="费用分摊金额" label="费用分摊金额" min-width="120" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('费用分摊金额')">
             <template slot-scope="scope">{{ formatNumber(scope.row['费用分摊金额'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="毛利" label="毛利" min-width="96" align="right" show-overflow-tooltip>
+          <el-table-column prop="毛利" label="毛利" min-width="96" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('毛利')">
             <template slot-scope="scope">{{ formatNumber(scope.row['毛利'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="毛利率(%)" label="毛利率(%)" min-width="100" align="right" show-overflow-tooltip>
+          <el-table-column prop="毛利率(%)" label="毛利率(%)" min-width="100" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('毛利率(%)')">
             <template slot-scope="scope">{{ formatNumber(scope.row['毛利率(%)'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="0单价数量" label="0单价数量" min-width="100" align="right" show-overflow-tooltip>
+          <el-table-column prop="0单价数量" label="0单价数量" min-width="100" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('0单价数量')">
             <template slot-scope="scope">{{ formatNumber(scope.row['0单价数量'], 4) }}</template>
           </el-table-column>
-          <el-table-column prop="销售权重(%)" label="销售权重(%)" min-width="110" align="right" show-overflow-tooltip>
+          <el-table-column prop="销售权重(%)" label="销售权重(%)" min-width="110" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('销售权重(%)')">
             <template slot-scope="scope">{{ formatNumber(scope.row['销售权重(%)'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="金额权重(%)" label="金额权重(%)" min-width="110" align="right" show-overflow-tooltip>
+          <el-table-column prop="金额权重(%)" label="金额权重(%)" min-width="110" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('金额权重(%)')">
             <template slot-scope="scope">{{ formatNumber(scope.row['金额权重(%)'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="利润权重(%)" label="利润权重(%)" min-width="110" align="right" show-overflow-tooltip>
+          <el-table-column prop="利润权重(%)" label="利润权重(%)" min-width="110" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('利润权重(%)')">
             <template slot-scope="scope">{{ formatNumber(scope.row['利润权重(%)'], 2) }}</template>
           </el-table-column>
-          <el-table-column prop="平均利润" label="平均利润" min-width="110" align="right" show-overflow-tooltip>
+          <el-table-column prop="平均利润" label="平均利润" min-width="110" align="right" show-overflow-tooltip sortable :sort-method="sortNumeric('平均利润')">
             <template slot-scope="scope">{{ formatNumber(scope.row['平均利润'], 4) }}</template>
           </el-table-column>
         </NCC-table>
@@ -293,26 +245,6 @@ export default {
       productLoading: false
     }
   },
-  computed: {
-    summaryStats() {
-      const rows = Array.isArray(this.list) ? this.list : []
-      let totalQty = 0
-      let salesAmount = 0
-      let profit = 0
-      for (let i = 0; i < rows.length; i++) {
-        const r = rows[i] || {}
-        totalQty += this.parseNum(r['销售'])
-        salesAmount += this.parseNum(r['销售金额'])
-        profit += this.parseNum(r['毛利'])
-      }
-      return {
-        rowCount: rows.length,
-        totalQtyDisplay: this.formatSummaryNumber(totalQty, 4),
-        salesAmountDisplay: this.formatSummaryNumber(salesAmount, 2),
-        profitDisplay: this.formatSummaryNumber(profit, 2)
-      }
-    }
-  },
   created() {
     this.loadFilterOptions()
     this.fetchData()
@@ -332,12 +264,17 @@ export default {
         maximumFractionDigits: digits
       })
     },
-    formatSummaryNumber(n, digits) {
-      if (!Number.isFinite(n)) return '无'
-      return n.toLocaleString('zh-CN', {
-        minimumFractionDigits: 0,
-        maximumFractionDigits: digits
-      })
+    /** 表头排序：按数值字段（含千分位字符串） */
+    sortNumeric(prop) {
+      return (a, b) => this.parseNum(a[prop]) - this.parseNum(b[prop])
+    },
+    /** 表头排序：文本字段 */
+    sortText(prop) {
+      return (a, b) => {
+        const sa = String(a[prop] != null ? a[prop] : '').trim()
+        const sb = String(b[prop] != null ? b[prop] : '').trim()
+        return sa.localeCompare(sb, 'zh-CN')
+      }
     },
     displayText(val) {
       if (val == null || String(val).trim() === '') return '无'
@@ -469,105 +406,27 @@ export default {
 </script>
 <style lang="scss" scoped>
-.product-summary-page {
-  .product-summary-stats {
-    margin-bottom: 8px;
-  }
-
-  .product-summary-stat-card {
-    height: 100px;
-    padding: 12px;
-    border-radius: 12px;
-    box-sizing: border-box;
-    margin-bottom: 16px;
-    background: #fff;
-    border: 1px solid #ebeef5;
-    box-shadow: 0 2px 12px rgba(15, 23, 42, 0.06);
-    display: flex;
-    align-items: center;
-  }
-
-  .product-summary-stat-card__inner {
-    display: flex;
-    align-items: center;
-    width: 100%;
-    gap: 12px;
-  }
-
-  .product-summary-stat-card__icon {
-    font-size: 28px;
-    flex-shrink: 0;
-  }
-
-  .product-summary-stat-card__text {
-    min-width: 0;
-    flex: 1;
-  }
-
-  .product-summary-stat-card__label {
-    font-size: 13px;
-    color: #909399;
-    line-height: 1.3;
-    margin-bottom: 4px;
-  }
-
-  .product-summary-stat-card__value {
-    font-size: 18px;
-    font-weight: 700;
-    color: #303133;
-    line-height: 1.2;
-  }
-
-  .product-summary-stat-card--blue .product-summary-stat-card__icon {
-    color: #409eff;
-  }
-
-  .product-summary-stat-card--green .product-summary-stat-card__icon {
-    color: #67c23a;
-  }
-
-  .product-summary-stat-card--orange .product-summary-stat-card__icon {
-    color: #e6a23c;
-  }
-
-  .product-summary-stat-card--red .product-summary-stat-card__icon {
-    color: #f56c6c;
-  }
-
-  .product-summary-head {
-    align-items: center;
-  }
-
-  .product-summary-head__left {
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    gap: 4px;
-  }
-
-  .product-summary-head__title {
-    font-size: 15px;
-    font-weight: 600;
-    color: #303133;
-    display: inline-flex;
-    align-items: center;
-    gap: 8px;
-  }
+.product-summary-head {
+  align-items: center;
+}
-  .product-summary-head__title-icon {
-    color: #409eff;
-    font-size: 18px;
-  }
+.product-summary-head__title {
+  font-size: 15px;
+  font-weight: 600;
+  color: #303133;
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+}
-  .product-summary-head__hint {
-    font-size: 12px;
-    color: #909399;
-  }
+.product-summary-head__title-icon {
+  color: #409eff;
+  font-size: 18px;
+}
-  .product-summary-table {
-    ::v-deep .el-table .cell {
-      white-space: nowrap;
-    }
+.product-summary-table {
+  ::v-deep .el-table .cell {
+    white-space: nowrap;
   }
 }
 </style>
@@ -114,9 +114,14 @@ namespace NCC.Extend.Entitys.Dto.WtXsckd
         public string hysjh { get; set; }
         /// <summary>
-        /// 供应商
+        /// 往来单位/供应商展示名（采购类单据可能为 wt_wldw 名称）
         /// </summary>
         public string gys { get; set; }
+
+        /// <summary>
+        /// 与 wt_xsckd.gys 一致的主键（往来单位 wt_wldw 等，供表单下拉 value）
+        /// </summary>
+        public string gysId { get; set; }
         /// <summary>
         /// 单据状态
@@ -1138,6 +1138,26 @@ namespace NCC.Extend.WtXsckd
                 output.hysjh = entity.Hysjh ?? "";
             }
+            // 采购入库/采购退货等：gys 常为 wt_wldw 主键；详情表单用 gysId，展示用名称
+            output.gysId = entity.Gys;
+            if (!string.IsNullOrWhiteSpace(entity.Gys))
+            {
+                var wldwGysMc = await _db.Queryable<WtWldwEntity>()
+                    .Where(w => w.Id == entity.Gys)
+                    .Select(w => w.Dwmc)
+                    .FirstAsync();
+                if (!string.IsNullOrWhiteSpace(wldwGysMc))
+                    output.gys = wldwGysMc.Trim();
+                else
+                {
+                    var legacyGysMc = await _db.Queryable<WtGysEntity>()
+                        .Where(g => g.Id == entity.Gys)
+                        .Select(g => g.Gysmc)
+                        .FirstAsync();
+                    output.gys = string.IsNullOrWhiteSpace(legacyGysMc) ? entity.Gys : legacyGysMc.Trim();
+                }
+            }
+
             // ✅ 经手人/制单人/审核人/过账人：与列表一致，将用户 ID 转为姓名（详情页展示）
             await EnrichInfoOutputUserDisplayNamesAsync(output, entity);
@@ -1263,6 +1283,7 @@ namespace NCC.Extend.WtXsckd
                 .WhereIF(!string.IsNullOrEmpty(input.gzr), (xsckd, hy) => xsckd.Gzr.Equals(input.gzr))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), (xsckd, hy) => xsckd.Bz.Contains(input.bz))
                 .WhereIF(!string.IsNullOrEmpty(input.kh), (xsckd, hy) => xsckd.Kh.Contains(input.kh))
+                .WhereIF(!string.IsNullOrEmpty(input.gys), (xsckd, hy) => xsckd.Gys == input.gys.Trim())
                 .WhereIF(!string.IsNullOrEmpty(input.hysjh), (xsckd, hy) => 
                     (xsckd.Hysjh != null && xsckd.Hysjh.Contains(input.hysjh)) || 
                     (hy.Sjh != null && hy.Sjh.Contains(input.hysjh)))
@@ -1332,6 +1353,7 @@ namespace NCC.Extend.WtXsckd
                 EnrichListOutputYcddhFromRemarkIfNeeded(row);
             await EnrichWtXsckdListWarehouseDisplayAsync(pageRows);
             await EnrichListOutputKhDisplayAsync(pageRows);
+            await EnrichListOutputGysWldwDisplayAsync(pageRows);
             await EnrichListPersonDisplayFromMemberHyAsync(pageRows);
             if (pageRows.Any(x => x.djlx == "销售出库单" || x.djlx == "预售出库单"))
                 await EnrichOutboundLinkedReturnBillsAsync(pageRows);
@@ -1467,6 +1489,48 @@ namespace NCC.Extend.WtXsckd
         }
         /// <summary>
+        /// 列表：采购入库/采购退货等主表 <c>gys</c> 存 wt_wldw 主键时，将 <c>gys</c> 列展示为往来单位名称（原 SQL 子查 wt_gys 可能为空）。
+        /// </summary>
+        private async Task EnrichListOutputGysWldwDisplayAsync(List<WtXsckdListOutput> items)
+        {
+            if (items == null || items.Count == 0) return;
+            var targets = items.Where(x => x.djlx == "采购入库单" || x.djlx == "采购退货单").ToList();
+            if (targets.Count == 0) return;
+            var billIds = targets.Select(x => x.id).Where(id => !string.IsNullOrEmpty(id)).Select(id => id.Trim()).Distinct().ToList();
+            if (billIds.Count == 0) return;
+            var heads = await _db.Queryable<WtXsckdEntity>()
+                .Where(x => billIds.Contains(x.Id))
+                .Select(x => new { x.Id, x.Gys })
+                .ToListAsync();
+            var gysByBill = heads
+                .Where(h => !string.IsNullOrEmpty(h.Id))
+                .ToDictionary(h => h.Id.Trim(), h => h.Gys ?? "", StringComparer.Ordinal);
+            var rawGysIds = gysByBill.Values
+                .Where(s => !string.IsNullOrWhiteSpace(s))
+                .Select(s => s.Trim())
+                .Distinct()
+                .ToList();
+            if (rawGysIds.Count == 0) return;
+            var wldwRows = await _db.Queryable<WtWldwEntity>()
+                .Where(w => rawGysIds.Contains(w.Id))
+                .Select(w => new { w.Id, w.Dwmc })
+                .ToListAsync();
+            var wldwDwmcById = wldwRows
+                .Where(x => !string.IsNullOrEmpty(x.Id))
+                .ToDictionary(x => x.Id.Trim(), x => x.Dwmc ?? "", StringComparer.Ordinal);
+
+            foreach (var row in targets)
+            {
+                var bid = row.id?.Trim();
+                if (string.IsNullOrEmpty(bid) || !gysByBill.TryGetValue(bid, out var rawGys) || string.IsNullOrWhiteSpace(rawGys))
+                    continue;
+                var key = rawGys.Trim();
+                if (wldwDwmcById.TryGetValue(key, out var dwmc) && !string.IsNullOrWhiteSpace(dwmc))
+                    row.gys = dwmc.Trim();
+            }
+        }
+
+        /// <summary>
         /// 销售/预售退货单：经手人应为操作人（系统用户），非会员。
         /// </summary>
         private static bool IsSalesOrPresaleReturnDjlx(string? djlx) =>
@@ -2268,6 +2332,7 @@ namespace NCC.Extend.WtXsckd
                 .WhereIF(!string.IsNullOrEmpty(input.gzr), (xsckd, hy) => xsckd.Gzr.Equals(input.gzr))
                 .WhereIF(!string.IsNullOrEmpty(input.bz), (xsckd, hy) => xsckd.Bz.Contains(input.bz))
                 .WhereIF(!string.IsNullOrEmpty(input.kh), (xsckd, hy) => xsckd.Kh.Contains(input.kh))
+                .WhereIF(!string.IsNullOrEmpty(input.gys), (xsckd, hy) => xsckd.Gys == input.gys.Trim())
                 .WhereIF(!string.IsNullOrEmpty(input.hysjh), (xsckd, hy) =>
                     (xsckd.Hysjh != null && xsckd.Hysjh.Contains(input.hysjh)) ||
                     (hy.Sjh != null && hy.Sjh.Contains(input.hysjh)))
@@ -2316,6 +2381,7 @@ namespace NCC.Extend.WtXsckd
                 EnrichListOutputYcddhFromRemarkIfNeeded(row);
             await EnrichWtXsckdListWarehouseDisplayAsync(data);
             await EnrichListOutputKhDisplayAsync(data);
+            await EnrichListOutputGysWldwDisplayAsync(data);
             await EnrichListPersonDisplayFromMemberHyAsync(data);
             await EnrichOutboundLinkedReturnBillsAsync(data);
             if (data.Any(x => x.djlx == "预售出库单"))