diff --git a/klp-ui/src/components/KLPService/ProductSelect/index.vue b/klp-ui/src/components/KLPService/ProductSelect/index.vue
index c1d0da50..490756e5 100644
--- a/klp-ui/src/components/KLPService/ProductSelect/index.vue
+++ b/klp-ui/src/components/KLPService/ProductSelect/index.vue
@@ -6,13 +6,19 @@
     filterable
     @change="onChange"
     style="width: 100%"
+    :value-key="'productId'"
   >
     <el-option
       v-for="item in productOptions"
       :key="item.productId"
-      :label="item.productName"
+      :label="`${item.productName}（${item.productCode}）`"
       :value="item.productId"
-    />
+    >
+      <div class="option-label">
+        <span class="product-name">{{ item.productName }}</span>
+        <span class="product-code">{{ item.productCode }}</span>
+      </div>
+    </el-option>
   </el-select>
 </template>
 
@@ -22,7 +28,7 @@ import { listProduct } from '@/api/wms/product';
 export default {
   name: 'ProductSelect',
   props: {
-    value: [String, Number],
+    value: [String, null],
     disabled: Boolean,
     placeholder: {
       type: String,
@@ -59,3 +65,20 @@ export default {
   }
 };
 </script>
+
+<style scoped>
+.option-label {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.product-name {
+  font-size: 14px;
+  color: #333;
+}
+.product-code {
+  font-size: 12px;
+  color: #999;
+  margin-left: 10px;
+}
+</style>
diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
index 291f1d74..06a98d65 100644
--- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
+++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue
@@ -6,13 +6,19 @@
     clearable
     @change="onChange"
     style="width: 100%"
+    :value-key="'rawMaterialId'"
   >
     <el-option
       v-for="item in options"
       :key="item.rawMaterialId"
-      :label="item.rawMaterialName"
+      :label="`${item.rawMaterialName}（${item.rawMaterialCode}）`"
       :value="item.rawMaterialId"
-    />
+    >
+      <div class="option-label">
+        <span class="material-name">{{ item.rawMaterialName }}</span>
+        <span class="material-code">{{ item.rawMaterialCode }}</span>
+      </div>
+    </el-option>
   </el-select>
 </template>
 
@@ -22,7 +28,7 @@ import { listRawMaterial } from "@/api/wms/rawMaterial";
 export default {
   name: "RawMaterialSelect",
   props: {
-    value: [String, Number],
+    value: [String, null],
     placeholder: {
       type: String,
       default: "请选择原材料"
@@ -37,6 +43,10 @@ export default {
   watch: {
     value(val) {
       this.selected = val;
+    },
+    selected(val) {
+      this.$emit("input", val);
+      this.$emit("change", val);
     }
   },
   mounted() {
@@ -55,3 +65,20 @@ export default {
   }
 };
 </script>
+
+<style scoped>
+.option-label {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.material-name {
+  font-size: 14px;
+  color: #333;
+}
+.material-code {
+  font-size: 12px;
+  color: #999;
+  margin-left: 10px;
+}
+</style>
diff --git a/klp-ui/src/views/wms/order/panels/detail.vue b/klp-ui/src/views/wms/order/panels/detail.vue
index 0f408a8c..183bbc10 100644
--- a/klp-ui/src/views/wms/order/panels/detail.vue
+++ b/klp-ui/src/views/wms/order/panels/detail.vue
@@ -78,12 +78,14 @@
     <!-- 添加或修改订单明细对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="订单ID" prop="orderId">
+        <!-- <el-form-item label="订单ID" prop="orderId">
           <el-input v-model="form.orderId" placeholder="请输入订单ID" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="产品ID" prop="productId">
-          <ProductSelect v-model="form.productId" />
-        </el-form-item>
+        </el-form-item> -->
+        <el-table-column label="产品" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.productName }}<span v-if="scope.row.productCode">({{ scope.row.productCode }})</span>
+        </template>
+      </el-table-column>
         <el-form-item label="产品数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入产品数量" />
         </el-form-item>
diff --git a/klp-ui/src/views/wms/product/index.vue b/klp-ui/src/views/wms/product/index.vue
index a00a91ef..e5d6ca5d 100644
--- a/klp-ui/src/views/wms/product/index.vue
+++ b/klp-ui/src/views/wms/product/index.vue
@@ -25,49 +25,27 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基础材质分类" prop="baseMaterialId">
+      <el-form-item label="基础材质" prop="baseMaterialId">
         <CategorySelect v-model="queryParams.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
       </el-form-item>
-      <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
+      <el-form-item label="表面处理" prop="surfaceTreatmentId">
         <CategorySelect v-model="queryParams.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
       </el-form-item>
-      <el-form-item label="客户需求分类" prop="customerReqId">
+      <el-form-item label="客户需求" prop="customerReqId">
         <CategorySelect v-model="queryParams.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
       </el-form-item>
-      <el-form-item label="包装分类" prop="packagingId">
+      <el-form-item label="包装方式" prop="packagingId">
         <CategorySelect v-model="queryParams.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
       </el-form-item>
-      <el-form-item label="厚度" prop="thickness">
-        <el-input
-          v-model="queryParams.thickness"
-          placeholder="请输入厚度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="宽度" prop="width">
-        <el-input
-          v-model="queryParams.width"
-          placeholder="请输入宽度"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="内径" prop="innerDiameter">
-        <el-input
-          v-model="queryParams.innerDiameter"
-          placeholder="请输入内径"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="是否启用" prop="isEnabled">
-        <el-input
-          v-model="queryParams.isEnabled"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
+          <el-option
+            v-for="dict in dict.type.common_swicth"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -126,22 +104,22 @@
       <el-table-column label="产品编号" align="center" prop="productCode" />
       <el-table-column label="产品名称" align="center" prop="productName" />
       <el-table-column label="负责人" align="center" prop="owner" />
-      <el-table-column label="基础材质分类" align="center">
+      <el-table-column label="基础材质" align="center">
         <template slot-scope="scope">
           <CategoryRenderer :category-id="scope.row.baseMaterialId" />
         </template>
       </el-table-column>
-      <el-table-column label="表面处理分类" align="center">
+      <el-table-column label="表面处理" align="center">
         <template slot-scope="scope">
           <CategoryRenderer :category-id="scope.row.surfaceTreatmentId" />
         </template>
       </el-table-column>
-      <el-table-column label="客户需求分类" align="center">
+      <el-table-column label="客户需求" align="center">
         <template slot-scope="scope">
           <CategoryRenderer :category-id="scope.row.customerReqId" />
         </template>
       </el-table-column>
-      <el-table-column label="包装分类" align="center">
+      <el-table-column label="包装方式" align="center">
         <template slot-scope="scope">
           <CategoryRenderer :category-id="scope.row.packagingId" />
         </template>
@@ -149,7 +127,11 @@
       <el-table-column label="厚度" align="center" prop="thickness" />
       <el-table-column label="宽度" align="center" prop="width" />
       <el-table-column label="内径" align="center" prop="innerDiameter" />
-      <el-table-column label="是否启用" align="center" prop="isEnabled" />
+      <el-table-column label="是否启用" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -179,41 +161,81 @@
     />
 
     <!-- 添加或修改产品对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="产品编号" prop="productCode">
-          <el-input v-model="form.productCode" placeholder="请输入产品编号" />
-        </el-form-item>
-        <el-form-item label="产品名称" prop="productName">
-          <el-input v-model="form.productName" placeholder="请输入产品名称" />
-        </el-form-item>
-        <el-form-item label="负责人" prop="owner">
-          <el-input v-model="form.owner" placeholder="请输入负责人" />
-        </el-form-item>
-        <el-form-item label="基础材质分类" prop="baseMaterialId">
-          <CategorySelect v-model="form.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
-        </el-form-item>
-        <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
-          <CategorySelect v-model="form.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
-        </el-form-item>
-        <el-form-item label="客户需求分类" prop="customerReqId">
-          <CategorySelect v-model="form.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
-        </el-form-item>
-        <el-form-item label="包装分类" prop="packagingId">
-          <CategorySelect v-model="form.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
-        </el-form-item>
-        <el-form-item label="厚度" prop="thickness">
-          <el-input v-model="form.thickness" placeholder="请输入厚度" />
-        </el-form-item>
-        <el-form-item label="宽度" prop="width">
-          <el-input v-model="form.width" placeholder="请输入宽度" />
-        </el-form-item>
-        <el-form-item label="内径" prop="innerDiameter">
-          <el-input v-model="form.innerDiameter" placeholder="请输入内径" />
-        </el-form-item>
-        <el-form-item label="是否启用" prop="isEnabled">
-          <el-input v-model="form.isEnabled" placeholder="请输入是否启用" />
-        </el-form-item>
+        <el-divider>基础信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="产品编号" prop="productCode">
+              <el-input v-model="form.productCode" placeholder="请输入产品编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="productName">
+              <el-input v-model="form.productName" placeholder="请输入产品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="owner">
+              <el-input v-model="form.owner" placeholder="请输入负责人" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider>分类信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="基础材质" prop="baseMaterialId">
+              <CategorySelect v-model="form.baseMaterialId" categoryType="base_material" placeholder="请选择基础材质分类" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="表面处理" prop="surfaceTreatmentId">
+              <CategorySelect v-model="form.surfaceTreatmentId" categoryType="surface_treatment" placeholder="请选择表面处理分类" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="客户需求" prop="customerReqId">
+              <CategorySelect v-model="form.customerReqId" categoryType="customer_req" placeholder="请选择客户需求分类" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="包装方式" prop="packagingId">
+              <CategorySelect v-model="form.packagingId" categoryType="spec_packaging" placeholder="请选择包装分类" clearable />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-divider>参数信息</el-divider>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="厚度" prop="thickness">
+              <el-input v-model="form.thickness" placeholder="请输入厚度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="宽度" prop="width">
+              <el-input v-model="form.width" placeholder="请输入宽度" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="内径" prop="innerDiameter">
+              <el-input v-model="form.innerDiameter" placeholder="请输入内径" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否启用" prop="isEnabled">
+              <el-select v-model="form.isEnabled" placeholder="请选择是否启用" clearable>
+                <el-option
+                  v-for="dict in dict.type.common_swicth"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
@@ -234,6 +256,7 @@ export default {
     CategorySelect,
     CategoryRenderer
   },
+  dicts: ['common_swicth'],
   data() {
     return {
       // 按钮loading
diff --git a/klp-ui/src/views/wms/purchasePlan/index.vue b/klp-ui/src/views/wms/purchasePlan/index.vue
index f92f69cb..cd09f7ff 100644
--- a/klp-ui/src/views/wms/purchasePlan/index.vue
+++ b/klp-ui/src/views/wms/purchasePlan/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="120px">
       <el-form-item label="采购计划编号" prop="planCode">
         <el-input
           v-model="queryParams.planCode"
@@ -84,10 +84,9 @@
 
     <el-table v-loading="loading" :data="purchasePlanList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="采购计划ID" align="center" prop="planId" v-if="true"/>
       <el-table-column label="采购计划编号" align="center" prop="planCode" />
       <el-table-column label="负责人" align="center" prop="owner" />
-      <el-table-column label="关联订单ID" align="center" prop="orderId" />
+      <!-- <el-table-column label="关联订单ID" align="center" prop="orderId" /> -->
       <el-table-column label="状态" align="center" prop="status" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -322,9 +321,9 @@ export default {
         owner: [
           { required: true, message: "负责人不能为空", trigger: "blur" }
         ],
-        orderId: [
-          { required: true, message: "关联订单ID不能为空", trigger: "blur" }
-        ],
+        // orderId: [
+        //   { required: true, message: "关联订单ID不能为空", trigger: "blur" }
+        // ],
         status: [
           { required: true, message: "状态不能为空", trigger: "change" }
         ],
diff --git a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
index 2e02c669..7ef71357 100644
--- a/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
+++ b/klp-ui/src/views/wms/purchasePlan/panels/detail.vue
@@ -54,9 +54,13 @@
 
     <el-table v-loading="loading" :data="purchasePlanDetailList" @selection-change="handleSelectionChange" ref="purchasePlanDetailTable">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="明细ID" align="center" prop="detailId" v-if="true"/>
-      <el-table-column label="采购计划ID" align="center" prop="planId" />
-      <el-table-column label="原材料ID" align="center" prop="rawMaterialId" />
+      <!-- <el-table-column label="明细ID" align="center" prop="detailId" v-if="true"/>
+      <el-table-column label="采购计划ID" align="center" prop="planId" /> -->
+      <el-table-column label="原材料" align="center">
+        <template slot-scope="scope">
+          {{ scope.row.rawMaterialName }}<span v-if="scope.row.rawMaterialCode">({{ scope.row.rawMaterialCode }})</span>
+        </template>
+      </el-table-column>
       <el-table-column label="负责人" align="center" prop="owner" />
       <el-table-column label="计划采购数量" align="center" prop="quantity" />
       <el-table-column label="单位" align="center" prop="unit" />
@@ -124,10 +128,7 @@
     <!-- 添加或修改采购计划明细对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="采购计划ID" prop="planId">
-          <el-input v-model="form.planId" placeholder="请输入采购计划ID" />
-        </el-form-item>
-        <el-form-item label="原材料ID" prop="rawMaterialId">
+        <el-form-item label="原材料" prop="rawMaterialId">
           <el-input v-model="form.rawMaterialId" placeholder="请输入原材料ID" />
         </el-form-item>
         <el-form-item label="负责人" prop="owner">
diff --git a/klp-ui/src/views/wms/rawMaterial/index.vue b/klp-ui/src/views/wms/rawMaterial/index.vue
index 8ebb4be7..e1a583d7 100644
--- a/klp-ui/src/views/wms/rawMaterial/index.vue
+++ b/klp-ui/src/views/wms/rawMaterial/index.vue
@@ -33,7 +33,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="基础材质分类" prop="baseMaterialId">
+      <el-form-item label="基础材质" prop="baseMaterialId">
         <CategorySelect
           v-model="queryParams.baseMaterialId"
           category-type="base_material"
@@ -41,7 +41,7 @@
           clearable
         />
       </el-form-item>
-      <el-form-item label="表面处理分类" prop="surfaceTreatmentId">
+      <el-form-item label="表面处理" prop="surfaceTreatmentId">
         <CategorySelect
           v-model="queryParams.surfaceTreatmentId"
           category-type="surface_treatment"
@@ -50,12 +50,14 @@
         />
       </el-form-item>
       <el-form-item label="是否启用" prop="isEnabled">
-        <el-input
-          v-model="queryParams.isEnabled"
-          placeholder="请输入是否启用"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
+          <el-option
+            v-for="dict in dict.type.common_swicth"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
@@ -126,7 +128,11 @@
           <CategoryRenderer :category-id="scope.row.surfaceTreatmentId" />
         </template>
       </el-table-column>
-      <el-table-column label="是否启用" align="center" prop="isEnabled" />
+      <el-table-column label="是否启用" align="center" prop="isEnabled">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.common_swicth" :value="scope.row.isEnabled"/>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -185,7 +191,14 @@
         </el-row>
 
         <el-form-item label="是否启用" prop="isEnabled">
-          <el-input v-model="form.isEnabled" placeholder="请输入是否启用" />
+          <el-select v-model="form.isEnabled" placeholder="请选择是否启用" clearable>
+            <el-option
+              v-for="dict in dict.type.common_swicth"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
@@ -277,6 +290,7 @@ export default {
     CategorySelect,
     CategoryRenderer
   },
+  dicts: ['common_swicth'],
   data() {
     return {
       // 按钮loading
diff --git a/klp-ui/src/views/wms/stock/index.vue b/klp-ui/src/views/wms/stock/index.vue
index 2edee58e..1e23a39f 100644
--- a/klp-ui/src/views/wms/stock/index.vue
+++ b/klp-ui/src/views/wms/stock/index.vue
@@ -19,7 +19,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="物料" prop="itemId">
-          <raw-material-select v-if="queryParams.itemType === 'rawMaterial'" v-model="queryParams.itemId"
+          <raw-material-select v-if="queryParams.itemType === 'raw_material'" v-model="queryParams.itemId"
             placeholder="请选择原材料" style="width: 100%;" clearable />
           <product-select v-else-if="queryParams.itemType === 'product'" v-model="queryParams.itemId"
             placeholder="请选择产品" style="width: 100%;" clearable />