Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/components/KLPService/BomPanel/BomItem.vue

@@ -0,0 +1,255 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="bomItemList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="属性名称" align="center" prop="attrKey" />
+      <el-table-column label="属性值" align="center" prop="attrValue" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改BOM 明细，存放属性–值对话框 -->
+    <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="属性名称" prop="attrKey">
+          <el-input v-model="form.attrKey" placeholder="请输入属性名称" />
+        </el-form-item>
+        <el-form-item label="属性值" prop="attrValue">
+          <el-input v-model="form.attrValue" placeholder="请输入属性值" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listBomItem, getBomItem, delBomItem, addBomItem, updateBomItem } from "@/api/wms/bomItem";
+
+export default {
+  name: "BomItem",
+  dicts: ['common_swicth'],
+  props: {
+    bomId: [String, Number],
+  },
+  data() {
+    return {
+      // 按钮loading
+      buttonLoading: false,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // BOM 明细，存放属性–值表格数据
+      bomItemList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        bomId: this.bomId,
+        attrKey: undefined,
+        attrValue: undefined,
+        isEnabled: undefined,
+      },
+      // 表单参数
+      form: {
+        bomId: this.bomId,
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询BOM 明细，存放属性–值列表 */
+    getList() {
+      this.loading = true;
+      listBomItem(this.queryParams).then(response => {
+        this.bomItemList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        itemId: undefined,
+        bomId: this.bomId,
+        attrKey: undefined,
+        attrValue: undefined,
+        remark: undefined
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.itemId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加BOM 明细，存放属性–值";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.loading = true;
+      this.reset();
+      const itemId = row.itemId || this.ids
+      getBomItem(itemId).then(response => {
+        this.loading = false;
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改BOM 明细，存放属性–值";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          if (this.form.itemId != null) {
+            updateBomItem(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          } else {
+            addBomItem(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            }).finally(() => {
+              this.buttonLoading = false;
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const itemIds = row.itemId || this.ids;
+      this.$modal.confirm('是否确认删除BOM 明细，存放属性–值编号为"' + itemIds + '"的数据项？').then(() => {
+        this.loading = true;
+        return delBomItem(itemIds);
+      }).then(() => {
+        this.loading = false;
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+        this.$store.dispatch('category/getBomMap');
+      }).catch(() => {
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('wms/bomItem/export', {
+        ...this.queryParams
+      }, `bomItem_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>

klp-ui/src/components/KLPService/BomPanel/index.vue

@@ -0,0 +1,251 @@
+<template>
+  <div class="bom-container">
+    <!-- 当没有传入id时显示创建按钮 -->
+    <div v-if="!id" class="create-bom">
+      <el-button 
+        type="primary"
+        :loading="createLoading"
+        :disabled="createLoading"
+        @click="handleCreate"
+        class="create-button"
+      >
+        <template v-if="!createLoading">
+          <i class="el-icon-plus"></i> 创建BOM
+        </template>
+        <template v-else>
+          创建中...
+        </template>
+      </el-button>
+    </div>
+
+    <!-- 当传入id时显示数据区域 -->
+    <div v-else class="bom-details">
+      <div v-if="loading" class="loading-indicator">
+        加载中...
+        <div class="spinner"></div>
+      </div>
+      
+      <div v-if="error" class="error-message">
+        加载失败: {{ error }}
+        <button @click="fetchData" class="retry-button">重试</button>
+      </div>
+
+      <div v-if="data && !loading">
+        <el-form label-width="100px">
+          <el-form-item label="BOM名称">
+            <el-input v-model="info.bomName" @blur="handleUpdateBom"/>
+          </el-form-item>
+          <el-form-item label="BOM编码">
+            <el-input v-model="info.bomCode" @blur="handleUpdateBom"/>
+          </el-form-item>
+        </el-form>
+        <BomItem :bomId="id" />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { addBom, updateBom, getBom } from '@/api/wms/bom';
+import { listBomItem } from '@/api/wms/bomItem';
+import { updateProduct } from '@/api/wms/product';
+import { updateRawMaterial } from '@/api/wms/rawMaterial';
+
+import BomItem from './BomItem.vue';
+
+export default {
+  props: {
+    id: [String, Number],   // 支持字符串或数字类型的ID
+    itemId: [String, Number],
+    type: String            // 可选类型参数
+  },
+  components: {
+    BomItem
+  },
+  data() {
+    return {
+      loading: false,
+      error: null,
+      data: null,
+      info: {},
+      createLoading: false,
+    };
+  },
+  watch: {
+    id: {
+      immediate: true, // 组件创建时立即执行
+      handler(newVal) {
+        if (newVal) {
+          console.log('侦听到变化')
+          this.fetchBomDetails();
+        } else {
+          // 没有ID时重置数据
+          this.data = null;
+          this.error = null;
+        }
+      }
+    }
+  },
+  methods: {
+    async fetchBomDetails() {
+      try {
+        this.loading = true;
+        this.error = null;
+        
+        // 实际项目中替换为真实API调用
+        const response = await listBomItem({
+          bomId: this.id
+        })
+        this.data = response.rows;
+
+        const response2 = await getBom(this.id)
+        this.info = response2.data;
+      } catch (err) {
+        this.error = err.message || '请求失败，请重试';
+        console.error('获取BOM详情失败:', err);
+      } finally {
+        this.loading = false;
+      }
+    },
+    
+    async handleCreate() {
+      // 防止重复点击
+      if (this.createLoading) return;
+      
+      try {
+        this.createLoading = true;
+        // 添加一个semi类型
+        const bomName = (this.type == 'product' ? '产品BOM' : (this.type == 'raw_material' ? '原材料BOM' : '半成品BOM')) + new Date().getTime();
+        const bomCode = (this.type == 'product' ? 'P' : (this.type == 'raw_material' ? 'R' : 'S')) + new Date().getTime();
+        const bomResponse = await addBom({
+          bomName,
+          bomCode
+        });
+        
+        this.$message.success('创建BOM成功');
+        const bomData = bomResponse.data;
+
+        // 根据类型更新产品/原材料
+        if (this.type == 'product' && this.itemId) {
+          await updateProduct({
+            productId: this.itemId,
+            bomId: bomData.bomId
+          });
+        } else if (this.type == 'raw_material' && this.itemId) {
+          await updateRawMaterial({
+            rawMaterialId: this.itemId,
+            bomId: bomData.bomId
+          });
+        } else if (this.type == 'semi' && this.itemId) {
+          await updateProduct({
+            productId: this.itemId,
+            bomId: bomData.bomId
+          });
+        }
+        this.$store.dispatch('category/getBomMap');
+        
+        // 触发事件
+        this.$emit('addBom', bomData);
+      } catch (error) {
+        console.error('创建失败:', error);
+        this.$message.error(`创建失败: ${error.message || '未知错误'}`);
+      } finally {
+        this.createLoading = false;
+      }
+    },
+    
+    handleUpdateBom() {
+      this.$message.warning('正在更新BOM...');
+      updateBom({
+        bomId: this.id,
+        bomName: this.info.bomName,
+        bomCode: this.info.bomCode
+      }).then(_ => {
+        this.$message.success('更新BOM成功');
+        this.$store.dispatch('category/getBomMap');
+      })
+    },
+
+    fetchData() {
+      // 重试获取数据
+      if (this.id) this.fetchBomDetails();
+    }
+  }
+};
+</script>
+
+<style scoped>
+.create-bom {
+  text-align: center;
+  padding: 40px 0;
+}
+
+.create-button {
+  background-color: #4CAF50;
+  color: white;
+  border: none;
+  padding: 12px 24px;
+  font-size: 16px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.create-button:hover {
+  background-color: #388E3C;
+}
+
+.loading-indicator {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 12px;
+  padding: 20px;
+  color: #666;
+}
+
+.spinner {
+  width: 20px;
+  height: 20px;
+  border: 3px solid rgba(0,0,0,0.1);
+  border-radius: 50%;
+  border-top-color: #3498db;
+  animation: spin 1s linear infinite;
+}
+
+@keyframes spin {
+  to { transform: rotate(360deg); }
+}
+
+.error-message {
+  padding: 20px;
+  background-color: #ffebee;
+  color: #d32f2f;
+  border-radius: 4px;
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.retry-button {
+  padding: 8px 16px;
+  background-color: #f44336;
+  color: white;
+  border: none;
+  border-radius: 4px;
+  cursor: pointer;
+  width: 120px;
+}
+
+.bom-info {
+  margin-top: 20px;
+  padding: 15px;
+  background-color: #f9f9f9;
+  border-radius: 4px;
+  border-left: 4px solid #2196F3;
+}
+
+.bom-info p {
+  margin: 10px 0;
+}
+</style>

klp-ui/src/components/KLPService/ProductSelect/index.vue

@@ -1,30 +1,65 @@
 <template>
-  <el-select
+  <span>
-    v-model="selected"
+    <el-select v-model="selected" :placeholder="placeholder" :disabled="disabled" filterable clearable
-    :placeholder="placeholder"
+      @change="onChange" :value-key="'productId'">
-    :disabled="disabled"
+      <template #empty>
-    filterable
+        <el-button v-if="canAdd" @click="add" icon="el-icon-plus">未搜索到产品，点击添加</el-button>
-    clearable
+        <div v-else style="padding: 10px;">未搜索到产品</div>
-    @change="onChange"
+      </template>
-    style="width: 100%"
+      <el-option v-for="item in productOptions" :key="item.productId"
-    :value-key="'productId'"
+        :label="`${item.productName}（${item.productCode}）`" :value="item.productId">
-  >
+        <div class="option-label">
-    <el-option
+          <span class="product-name">{{ item.productName }}</span>
-      v-for="item in productOptions"
+          <span class="product-code">{{ item.productCode }}</span>
-      :key="item.productId"
+        </div>
-      :label="`${item.productName}（${item.productCode}）`"
+      </el-option>
-      :value="item.productId"
+    </el-select>
-    >
+
-      <div class="option-label">
+    <el-dialog v-if="canAdd" :visible.sync="addDialogVisible" title="添加产品" width="700px" append-to-body>
-        <span class="product-name">{{ item.productName }}</span>
+      <el-steps align-center :active="activeStep" finish-status="success">
-        <span class="product-code">{{ item.productCode }}</span>
+        <!-- 新增产品的步骤 -->
+        <el-step title="创建产品"></el-step>
+        <!-- 创建BOM的步骤 -->
+        <el-step title="填写BOM信息"></el-step>
+      </el-steps>
+
+      <el-form ref="form" v-if="activeStep === 0" :model="addForm" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="产品编号" prop="productCode">
+              <el-input v-model="addForm.productCode" placeholder="请输入产品编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="产品名称" prop="productName">
+              <el-input v-model="addForm.productName" placeholder="请输入产品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="owner">
+              <el-input v-model="addForm.owner" :multiple="false" placeholder="请填写负责人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unit">
+              <el-input v-model="addForm.unit" placeholder="请输入计量单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if="activeStep === 0" slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">创建产品</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-option>
+
-  </el-select>
+      <BomPanel v-if="activeStep === 1" :id="bomId" :itemId="itemId" :type="addForm.type" @addBom="handleBom" />
+    </el-dialog>
+  </span>
 </template>
 
 <script>
-import { listProduct } from '@/api/wms/product';
+import { listProduct, addProduct } from '@/api/wms/product';
+import BomPanel from '../BomPanel/index.vue';
 
 export default {
   name: 'ProductSelect',
@@ -34,12 +69,42 @@ export default {
     placeholder: {
       type: String,
       default: '请选择产品'
-    }
+    },
+    canAdd: {
+      default: false,
+      type: Boolean
+    },
+  },
+  components: {
+    BomPanel
   },
   data() {
     return {
       productOptions: [],
-      selected: this.value
+      selected: this.value,
+      addForm: {
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'product'
+      },
+      addDialogVisible: false,
+      rules: {
+        productCode: [
+          { required: true, message: "产品编号不能为空", trigger: "blur" }
+        ],
+        productName: [
+          { required: true, message: "产品名称不能为空", trigger: "blur" }
+        ],
+        owner: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+      itemId: undefined,
+      activeStep: 0,
+      bomId: undefined,
     };
   },
   watch: {
@@ -63,6 +128,49 @@ export default {
       // 通过val找到item
       const product = this.productOptions.find(p => p.productId === val);
       this.$emit('change', product);
+    },
+    add() {
+      this.addDialogVisible = true;
+      this.addForm = {
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'product'
+      };
+      this.bomId = undefined;
+      this.itemId = undefined;
+    },
+    handleBom(bom) {
+      this.bomId = bom.bomId;
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          // console.log(this.addForm);
+          addProduct(this.addForm).then(res => {
+            this.$modal && this.$modal.msgSuccess("创建产品成功");
+            this.getProductOptions();
+            console.log(res);
+            this.itemId = res.productId;
+            this.$emit('input', res.productId);
+            this.activeStep = 1;
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      });
+    },
+    cancel() {
+      this.addDialogVisible = false;
+      this.addForm = {
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'product'
+      };
     }
   }
 };
@@ -74,10 +182,12 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
+
 .product-name {
   font-size: 14px;
   color: #333;
 }
+
 .product-code {
   font-size: 12px;
   color: #999;

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -1,30 +1,66 @@
 <template>
-  <el-select
+  <span>
-    v-model="selected"
+    <el-select v-model="selected" :placeholder="placeholder" filterable clearable :loading="loading" @change="onChange"
-    :placeholder="placeholder"
+      style="width: 100%" :value-key="'rawMaterialId'">
-    filterable
+      <template #empty>
-    clearable
+        <el-button v-if="canAdd" @click="add" icon="el-icon-plus">未搜索到原材料，点击添加</el-button>
-    :loading="loading"
+        <div v-else style="padding: 10px;">未搜索到原材料</div>
-    @change="onChange"
+      </template>
-    style="width: 100%"
+      <el-option v-for="item in options" :key="item.rawMaterialId"
-    :value-key="'rawMaterialId'"
+        :label="`${item.rawMaterialName}（${item.rawMaterialCode}）`" :value="item.rawMaterialId">
-  >
+        <div class="option-label">
-    <el-option
+          <span class="material-name">{{ item.rawMaterialName }}</span>
-      v-for="item in options"
+          <span class="material-code">{{ item.rawMaterialCode }}</span>
-      :key="item.rawMaterialId"
+        </div>
-      :label="`${item.rawMaterialName}（${item.rawMaterialCode}）`"
+      </el-option>
-      :value="item.rawMaterialId"
+    </el-select>
-    >
+    <el-dialog v-if="canAdd" :visible.sync="addDialogVisible" title="添加原材料" width="700px" append-to-body>
-      <div class="option-label">
+      <el-steps align-center :active="activeStep" finish-status="success">
-        <span class="material-name">{{ item.rawMaterialName }}</span>
+        <!-- 新增原材料的步骤 -->
-        <span class="material-code">{{ item.rawMaterialCode }}</span>
+        <el-step title="创建原材料"></el-step>
+        <!-- 创建BOM的步骤 -->
+        <el-step title="填写BOM信息"></el-step>
+      </el-steps>
+
+      <el-form ref="form" v-if="activeStep === 0" :model="addForm" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="原材料编号" prop="rawMaterialCode">
+              <el-input v-model="addForm.rawMaterialCode" placeholder="请输入原材料编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="原材料名称" prop="rawMaterialName">
+              <el-input v-model="addForm.rawMaterialName" placeholder="请输入原材料名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="owner">
+              <el-input v-model="addForm.owner" :multiple="false" placeholder="请填写负责人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unit">
+              <el-input v-model="addForm.unit" placeholder="请输入计量单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if="activeStep === 0" slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">创建原材料</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-option>
+
-  </el-select>
+      <BomPanel v-if="activeStep === 1" :id="bomId" :itemId="itemId" :type="addForm.type" @addBom="handleBom" />
+    </el-dialog>
+  </span>
+
 </template>
 
 <script>
 import { mapGetters } from "vuex";
+import { addRawMaterial } from '@/api/wms/rawMaterial';
+import BomPanel from '../BomPanel/index.vue';
 
 export default {
   name: "RawMaterialSelect",
@@ -33,13 +69,43 @@ export default {
     placeholder: {
       type: String,
       default: "请选择原材料"
+    },
+    canAdd: {
+      type: Boolean,
+      default: false
     }
   },
+  components: {
+    BomPanel
+  },
   data() {
     return {
       options: [],
       selected: this.value,
-      loading: false
+      loading: false,
+      addForm: {
+        rawMaterialCode: undefined,
+        rawMaterialName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'raw_material'
+      },
+      addDialogVisible: false,
+      rules: {
+        rawMaterialCode: [
+          { required: true, message: "原材料编号不能为空", trigger: "blur" }
+        ],
+        rawMaterialName: [
+          { required: true, message: "原材料名称不能为空", trigger: "blur" }
+        ],
+        owner: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+      itemId: undefined,
+      activeStep: 0,
+      bomId: undefined,
     };
   },
   watch: {
@@ -61,6 +127,49 @@ export default {
       const rawMaterial = this.options.find(p => p.rawMaterialId === val);
       this.$emit('change', rawMaterial);
     },
+    add() {
+      this.addDialogVisible = true;
+      this.addForm = {
+        rawMaterialCode: undefined,
+        rawMaterialName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'raw_material'
+      };
+      this.bomId = undefined;
+      this.itemId = undefined;
+    },
+    handleBom(bom) {
+      this.bomId = bom.bomId;
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          // console.log(this.addForm);
+          addRawMaterial(this.addForm).then(res => {
+            this.$modal && this.$modal.msgSuccess("创建原材料成功");
+            this.$store.dispatch('category/getRawMaterialMap');
+            console.log(res);
+            this.itemId = res.rawMaterialId;
+            this.$emit('input', res.rawMaterialId);
+            this.activeStep = 1;
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      });
+    },
+    cancel() {
+      this.addDialogVisible = false;
+      this.addForm = {
+        rawMaterialCode: undefined,
+        rawMaterialName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'raw_material'
+      };
+    }
   }
 };
 </script>
@@ -71,10 +180,12 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
+
 .material-name {
   font-size: 14px;
   color: #333;
 }
+
 .material-code {
   font-size: 12px;
   color: #999;

klp-ui/src/components/KLPService/SemiSelect/index.vue

@@ -1,45 +1,110 @@
 <template>
-  <el-select
+  <span>
-    v-model="selected"
+    <el-select v-model="selected" :placeholder="placeholder" :disabled="disabled" filterable clearable
-    :placeholder="placeholder"
+      @change="onChange" :value-key="'productId'">
-    :disabled="disabled"
+      <template #empty>
-    filterable
+        <el-button v-if="canAdd" @click="add" icon="el-icon-plus">未搜索到半成品，点击添加</el-button>
-    clearable
+        <div v-else style="padding: 10px;">未搜索到半成品</div>
-    @change="onChange"
+      </template>
-    style="width: 100%"
+      <el-option v-for="item in productOptions" :key="item.productId"
-    :value-key="'productId'"
+        :label="`${item.productName}（${item.productCode}）`" :value="item.productId">
-  >
+        <div class="option-label">
-    <el-option
+          <span class="product-name">{{ item.productName }}</span>
-      v-for="item in productOptions"
+          <span class="product-code">{{ item.productCode }}</span>
-      :key="item.productId"
+        </div>
-      :label="`${item.productName}（${item.productCode}）`"
+      </el-option>
-      :value="item.productId"
+    </el-select>
-    >
+
-      <div class="option-label">
+    <el-dialog v-if="canAdd" :visible.sync="addDialogVisible" title="添加半成品" width="700px" append-to-body>
-        <span class="product-name">{{ item.productName }}</span>
+      <el-steps align-center :active="activeStep" finish-status="success">
-        <span class="product-code">{{ item.productCode }}</span>
+        <!-- 新增半成品的步骤 -->
+        <el-step title="创建半成品"></el-step>
+        <!-- 创建BOM的步骤 -->
+        <el-step title="填写BOM信息"></el-step>
+      </el-steps>
+
+      <el-form ref="form" v-if="activeStep === 0" :model="addForm" :rules="rules" label-width="120px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="半成品编号" prop="productCode">
+              <el-input v-model="addForm.productCode" placeholder="请输入半成品编号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="半成品名称" prop="productName">
+              <el-input v-model="addForm.productName" placeholder="请输入半成品名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="负责人" prop="owner">
+              <el-input v-model="addForm.owner" :multiple="false" placeholder="请填写负责人" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="计量单位" prop="unit">
+              <el-input v-model="addForm.unit" placeholder="请输入计量单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div v-if="activeStep === 0" slot="footer" class="dialog-footer">
+        <el-button :loading="buttonLoading" type="primary" @click="submitForm">创建半成品</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
-    </el-option>
+
-  </el-select>
+      <BomPanel v-if="activeStep === 1" :id="bomId" :itemId="itemId" :type="addForm.type" @addBom="handleBom" />
+    </el-dialog>
+  </span>
 </template>
 
 <script>
-import { listProduct } from '@/api/wms/product';
+import { listProduct, addProduct } from '@/api/wms/product';
+import BomPanel from '../BomPanel/index.vue';
 
 export default {
-  name: 'SemiSelect',
+  name: 'ProductSelect',
   props: {
     value: [String, null],
     disabled: Boolean,
     placeholder: {
       type: String,
-      default: '请选择产品'
+      default: '请选择半成品'
-    }
+    },
+    canAdd: {
+      default: false,
+      type: Boolean
+    },
+  },
+  components: {
+    BomPanel
   },
   data() {
     return {
       productOptions: [],
-      selected: this.value
+      selected: this.value,
+      addForm: {
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'semi'
+      },
+      addDialogVisible: false,
+      rules: {
+        productCode: [
+          { required: true, message: "半成品编号不能为空", trigger: "blur" }
+        ],
+        productName: [
+          { required: true, message: "半成品名称不能为空", trigger: "blur" }
+        ],
+        owner: [
+          { required: true, message: "负责人不能为空", trigger: "blur" }
+        ],
+      },
+      buttonLoading: false,
+      itemId: undefined,
+      activeStep: 0,
+      bomId: undefined,
     };
   },
   watch: {
@@ -63,6 +128,49 @@ export default {
       // 通过val找到item
       const product = this.productOptions.find(p => p.productId === val);
       this.$emit('change', product);
+    },
+    add() {
+      this.addDialogVisible = true;
+      this.addForm = {
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'semi'
+      };
+      this.bomId = undefined;
+      this.itemId = undefined;
+    },
+    handleBom(bom) {
+      this.bomId = bom.bomId;
+    },
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          this.buttonLoading = true;
+          // console.log(this.addForm);
+          addProduct(this.addForm).then(res => {
+            this.$modal && this.$modal.msgSuccess("创建半成品成功");
+            this.getProductOptions();
+            console.log(res);
+            this.itemId = res.productId;
+            this.$emit('input', res.productId);
+            this.activeStep = 1;
+          }).finally(() => {
+            this.buttonLoading = false;
+          });
+        }
+      });
+    },
+    cancel() {
+      this.addDialogVisible = false;
+      this.addForm = {
+        productCode: undefined,
+        productName: undefined,
+        owner: undefined,
+        unit: undefined,
+        type: 'semi'
+      };
     }
   }
 };
@@ -74,10 +182,12 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
+
 .product-name {
   font-size: 14px;
   color: #333;
 }
+
 .product-code {
   font-size: 12px;
   color: #999;

klp-ui/src/views/wms/order/panels/detail.vue

@@ -113,7 +113,7 @@
           <el-input v-model="form.orderId" placeholder="请输入订单ID" :disabled="true" />
         </el-form-item> -->
         <el-form-item label="产品" prop="productId">
-          <ProductSelect v-model="form.productId" placeholder="请选择产品" @change="onProductChange" />
+          <ProductSelect :can-add="true" v-model="form.productId" placeholder="请选择产品" @change="onProductChange" />
         </el-form-item>
         <el-form-item label="产品数量" prop="quantity">
           <el-input v-model="form.quantity" placeholder="请输入产品数量" />

klp-ui/src/views/wms/print/index-auto.vue

@@ -0,0 +1,231 @@
+<template>
+  <div style="position: relative;">
+    <div style="position: absolute; top: 10px; left: 10px;">
+      <!-- 策略切换单选框 -->
+      <el-radio-group 
+        v-model="currentStrategy" 
+        size="mini"
+      >
+        <el-radio label="stockIo">盘点单</el-radio>
+        <el-radio label="order">订单</el-radio>
+        <el-radio label="purchase">采购计划</el-radio>
+      </el-radio-group>
+
+      <!-- 动态下拉选择框，根据策略切换数据源 -->
+      <el-select 
+        v-model="currentId" 
+        :placeholder="`请选择${strategyLabels[currentStrategy]}`" 
+        style="width: 200px;"
+        size="mini"
+      >
+        <el-option 
+          v-for="item in currentList" 
+          :key="item[keyField]" 
+          :label="item[labelField]" 
+          :value="item[keyField]" 
+        />
+      </el-select>
+    </div>
+    
+    <div class="print-container" v-loading="loading">
+      <BarCode :barcodes="drawerBarcodeData" @delete="handleDelete" />
+    </div>
+  </div>
+</template>
+
+<script>
+import BarCode from '../stockIo/panels/barcode.vue';
+import { listStockIo } from '@/api/wms/stockIo';
+import { listStockIoDetail } from '@/api/wms/stockIoDetail';
+import { listOrder } from '@/api/wms/order';
+import { listOrderDetail } from '@/api/wms/orderDetail';
+import { listPurchasePlan } from '@/api/wms/purchasePlan';
+import { listPurchasePlanDetail } from '@/api/wms/purchasePlanDetail';
+import { mapState } from 'vuex';
+import { ITEM_TYPE } from '../../../utils/enums';
+
+// 策略配置 - 集中管理各策略的元数据
+const strategyMetadata = {
+  stockIo: {
+    label: '盘点单',
+    listKey: 'stockIoList',
+    keyField: 'stockIoId',
+    labelField: 'stockIoCode'
+  },
+  order: {
+    label: '订单',
+    listKey: 'orderList',
+    keyField: 'orderId',
+    labelField: 'orderCode'
+  },
+  purchase: {
+    label: '采购计划',
+    listKey: 'purchaseList',
+    keyField: 'planId',
+    labelField: 'planCode'
+  }
+};
+
+// 策略实现 - 封装各策略的具体业务逻辑
+const strategies = {
+  stockIo: {
+    // 加载列表数据
+    list: (vm) => {
+      if (vm.stockIoList.length) return;
+      vm.loading = true;
+      listStockIo({ pageNum: 1, pageSize: 9999 }).then(res => {
+        vm.stockIoList = res.rows || [];
+      }).finally(() => {
+        vm.loading = false;
+      });
+    },
+    // 获取条码数据
+    getBarcodeData: (vm) => {
+      if (!vm.currentId) return;
+      vm.loading = true;
+      listStockIoDetail({ stockIoId: vm.currentId }).then(res => {
+        const details = res.rows || [];
+        vm.drawerBarcodeData = details
+          .filter(el => el.recordType === 0)
+          .map(item => ({
+            code: encodeURIComponent(`${item.itemType}__${item.itemId || ''}`),
+            count: Math.min(item.quantity, 10),
+            textTpl: item.itemType === ITEM_TYPE.PRODUCT 
+              ? `${vm.productMap[item.itemId]?.productName}[${vm.productMap[item.itemId]?.productCode}](${item.quantity})`
+              : `${vm.rawMaterialMap[item.itemId]?.rawMaterialName}[${vm.rawMaterialMap[item.itemId]?.rawMaterialCode}](${item.quantity})`
+          }));
+      }).finally(() => {
+        vm.loading = false;
+      });
+    }
+  },
+  order: {
+    list: (vm) => {
+      if (vm.orderList.length) return;
+      vm.loading = true;
+      listOrder({ pageNum: 1, pageSize: 9999 }).then(res => {
+        vm.orderList = res.rows || [];
+      }).finally(() => {
+        vm.loading = false;
+      });
+    },
+    getBarcodeData: (vm) => {
+      if (!vm.currentId) return;
+      vm.loading = true;
+      listOrderDetail({ orderId: vm.currentId }).then(res => {
+        const details = res.rows || [];
+        vm.drawerBarcodeData = details.map(item => ({
+          code: encodeURIComponent(`product__${item.productId || ''}`),
+          count: Math.min(item.quantity, 10),
+          textTpl: `${vm.productMap[item.productId]?.productName}[${vm.productMap[item.productId]?.productCode}](${item.quantity})`
+        }));
+      }).finally(() => {
+        vm.loading = false;
+      });
+    }
+  },
+  purchase: {
+    list: (vm) => {
+      if (vm.purchaseList.length) return;
+      vm.loading = true;
+      listPurchasePlan({ pageNum: 1, pageSize: 9999 }).then(res => {
+        vm.purchaseList = res.rows || [];
+      }).finally(() => {
+        vm.loading = false;
+      });
+    },
+    getBarcodeData: (vm) => {
+      if (!vm.currentId) return;
+      vm.loading = true;
+      listPurchasePlanDetail({ planId: vm.currentId }).then(res => {
+        const details = res.rows || [];
+        vm.drawerBarcodeData = details.map(item => ({
+          code: encodeURIComponent(`raw_material__${item.rawMaterialId || ''}`),
+          count: Math.min(item.quantity, 10),
+          textTpl: `${vm.rawMaterialMap[item.rawMaterialId]?.rawMaterialName}[${vm.rawMaterialMap[item.rawMaterialId]?.rawMaterialCode}](${item.quantity})`
+        }));
+      }).finally(() => {
+        vm.loading = false;
+      });
+    }
+  }
+};
+
+export default {
+  name: 'Print',
+  components: { BarCode },
+  data() {
+    return {
+      currentStrategy: 'stockIo', // 默认策略
+      currentId: '', // 当前选中的ID
+      stockIoList: [], // 盘点单列表
+      orderList: [], // 订单列表
+      purchaseList: [], // 采购计划列表
+      drawerBarcodeData: [], // 条码数据
+      loading: false // 加载状态
+    };
+  },
+  computed: {
+    ...mapState({
+      rawMaterialMap: state => state.category.rawMaterialMap,
+      productMap: state => state.category.productMap
+    }),
+    // 策略标签映射
+    strategyLabels() {
+      return Object.keys(strategyMetadata).reduce((obj, key) => {
+        obj[key] = strategyMetadata[key].label;
+        return obj;
+      }, {});
+    },
+    // 当前策略对应的列表数据
+    currentList() {
+      return this[strategyMetadata[this.currentStrategy].listKey] || [];
+    },
+    // 当前策略的主键字段
+    keyField() {
+      return strategyMetadata[this.currentStrategy].keyField;
+    },
+    // 当前策略的显示字段
+    labelField() {
+      return strategyMetadata[this.currentStrategy].labelField;
+    }
+  },
+  watch: {
+    // 策略切换时的处理
+    currentStrategy: {
+      handler(newVal) {
+        this.currentId = ''; // 清空选择
+        this.drawerBarcodeData = []; // 清空条码数据
+        // 加载对应策略的列表数据
+        if (strategies[newVal]?.list) {
+          strategies[newVal].list(this);
+        }
+      },
+      immediate: true // 初始化时执行
+    },
+    // 选中项变化时的处理
+    currentId(newVal) {
+      if (!newVal) {
+        this.drawerBarcodeData = [];
+        return;
+      }
+      // 获取对应策略的条码数据
+      if (strategies[this.currentStrategy]?.getBarcodeData) {
+        strategies[this.currentStrategy].getBarcodeData(this);
+      }
+    }
+  },
+  methods: {
+    handleDelete(cfg, idx) {
+      this.drawerBarcodeData.splice(idx, 1);
+    }
+  }
+};
+</script>
+
+<style scoped lang="scss">
+.print-container {
+  margin-top: 20px;
+  padding: 20px;
+}
+</style>

klp-ui/src/views/wms/print/index.vue

@@ -1,226 +1,69 @@
 <template>
   <div style="position: relative;">
-    <div style="position: absolute; top: 10px; left: 10px;">
+    <!-- 录入二维码列表 -->
-      <!-- 策略切换单选框 -->
+    <el-form inline style="position: relative;">
-      <el-radio-group 
+      <el-form-item label="物料类型">
-        v-model="currentStrategy" 
+        <el-select v-model="itemType" placeholder="请选择物料类型" clearable>
-        size="mini"
+          <el-option v-for="dict in dict.type.stock_item_type" :key="dict.value" :label="dict.label"
-      >
+            :value="dict.value" />
-        <el-radio label="stockIo">盘点单</el-radio>
+        </el-select>
-        <el-radio label="order">订单</el-radio>
+      </el-form-item>
-        <el-radio label="purchase">采购计划</el-radio>
+      <el-form-item label="物料信息">
-      </el-radio-group>
+        <ProductSelect can-add v-if="itemType === 'product'" v-model="itemId" placeholder="请选择产品"
+          @change="onItemChange" />
+        <SemiSelect can-add v-else-if="itemType === 'semi'" v-model="itemId" placeholder="请选择半成品"
+          @change="onItemChange" />
+        <RawMaterialSelect can-add v-else-if="itemType === 'raw_material'" v-model="itemId" placeholder="请选择原材料"
+          @change="onItemChange" />
+        <el-input v-else disabled v-model="itemId" placeholder="请先选择物料类型" :disabled="true" style="width: 100%;" />
+      </el-form-item>
+    </el-form>
 
-      <!-- 动态下拉选择框，根据策略切换数据源 -->
-      <el-select 
-        v-model="currentId" 
-        :placeholder="`请选择${strategyLabels[currentStrategy]}`" 
-        style="width: 200px;"
-        size="mini"
-      >
-        <el-option 
-          v-for="item in currentList" 
-          :key="item[keyField]" 
-          :label="item[labelField]" 
-          :value="item[keyField]" 
-        />
-      </el-select>
-    </div>
-    
     <div class="print-container" v-loading="loading">
-      <BarCode :barcodes="drawerBarcodeData" />
+      <BarCode :barcodes="drawerBarcodeData" @delete="handleDelete" />
     </div>
   </div>
 </template>
 
 <script>
 import BarCode from '../stockIo/panels/barcode.vue';
-import { listStockIo } from '@/api/wms/stockIo';
+import ProductSelect from '@/components/KLPService/ProductSelect/index.vue';
-import { listStockIoDetail } from '@/api/wms/stockIoDetail';
+import SemiSelect from '@/components/KLPService/SemiSelect/index.vue';
-import { listOrder } from '@/api/wms/order';
+import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect/index.vue';
-import { listOrderDetail } from '@/api/wms/orderDetail';
-import { listPurchasePlan } from '@/api/wms/purchasePlan';
-import { listPurchasePlanDetail } from '@/api/wms/purchasePlanDetail';
-import { mapState } from 'vuex';
-import { ITEM_TYPE } from '../../../utils/enums';
-
-// 策略配置 - 集中管理各策略的元数据
-const strategyMetadata = {
-  stockIo: {
-    label: '盘点单',
-    listKey: 'stockIoList',
-    keyField: 'stockIoId',
-    labelField: 'stockIoCode'
-  },
-  order: {
-    label: '订单',
-    listKey: 'orderList',
-    keyField: 'orderId',
-    labelField: 'orderCode'
-  },
-  purchase: {
-    label: '采购计划',
-    listKey: 'purchaseList',
-    keyField: 'planId',
-    labelField: 'planCode'
-  }
-};
-
-// 策略实现 - 封装各策略的具体业务逻辑
-const strategies = {
-  stockIo: {
-    // 加载列表数据
-    list: (vm) => {
-      if (vm.stockIoList.length) return;
-      vm.loading = true;
-      listStockIo({ pageNum: 1, pageSize: 9999 }).then(res => {
-        vm.stockIoList = res.rows || [];
-      }).finally(() => {
-        vm.loading = false;
-      });
-    },
-    // 获取条码数据
-    getBarcodeData: (vm) => {
-      if (!vm.currentId) return;
-      vm.loading = true;
-      listStockIoDetail({ stockIoId: vm.currentId }).then(res => {
-        const details = res.rows || [];
-        vm.drawerBarcodeData = details
-          .filter(el => el.recordType === 0)
-          .map(item => ({
-            code: encodeURIComponent(`${item.itemType}__${item.itemId || ''}`),
-            count: Math.min(item.quantity, 10),
-            textTpl: item.itemType === ITEM_TYPE.PRODUCT 
-              ? `${vm.productMap[item.itemId]?.productName}[${vm.productMap[item.itemId]?.productCode}](${item.quantity})`
-              : `${vm.rawMaterialMap[item.itemId]?.rawMaterialName}[${vm.rawMaterialMap[item.itemId]?.rawMaterialCode}](${item.quantity})`
-          }));
-      }).finally(() => {
-        vm.loading = false;
-      });
-    }
-  },
-  order: {
-    list: (vm) => {
-      if (vm.orderList.length) return;
-      vm.loading = true;
-      listOrder({ pageNum: 1, pageSize: 9999 }).then(res => {
-        vm.orderList = res.rows || [];
-      }).finally(() => {
-        vm.loading = false;
-      });
-    },
-    getBarcodeData: (vm) => {
-      if (!vm.currentId) return;
-      vm.loading = true;
-      listOrderDetail({ orderId: vm.currentId }).then(res => {
-        const details = res.rows || [];
-        vm.drawerBarcodeData = details.map(item => ({
-          code: encodeURIComponent(`product__${item.productId || ''}`),
-          count: Math.min(item.quantity, 10),
-          textTpl: `${vm.productMap[item.productId]?.productName}[${vm.productMap[item.productId]?.productCode}](${item.quantity})`
-        }));
-      }).finally(() => {
-        vm.loading = false;
-      });
-    }
-  },
-  purchase: {
-    list: (vm) => {
-      if (vm.purchaseList.length) return;
-      vm.loading = true;
-      listPurchasePlan({ pageNum: 1, pageSize: 9999 }).then(res => {
-        vm.purchaseList = res.rows || [];
-      }).finally(() => {
-        vm.loading = false;
-      });
-    },
-    getBarcodeData: (vm) => {
-      if (!vm.currentId) return;
-      vm.loading = true;
-      listPurchasePlanDetail({ planId: vm.currentId }).then(res => {
-        const details = res.rows || [];
-        vm.drawerBarcodeData = details.map(item => ({
-          code: encodeURIComponent(`raw_material__${item.rawMaterialId || ''}`),
-          count: Math.min(item.quantity, 10),
-          textTpl: `${vm.rawMaterialMap[item.rawMaterialId]?.rawMaterialName}[${vm.rawMaterialMap[item.rawMaterialId]?.rawMaterialCode}](${item.quantity})`
-        }));
-      }).finally(() => {
-        vm.loading = false;
-      });
-    }
-  }
-};
 
 export default {
   name: 'Print',
-  components: { BarCode },
+  components: { BarCode, ProductSelect, SemiSelect, RawMaterialSelect },
+  dicts: ['stock_item_type'],
   data() {
     return {
-      currentStrategy: 'stockIo', // 默认策略
-      currentId: '', // 当前选中的ID
-      stockIoList: [], // 盘点单列表
-      orderList: [], // 订单列表
-      purchaseList: [], // 采购计划列表
       drawerBarcodeData: [], // 条码数据
-      loading: false // 加载状态
+      loading: false, // 加载状态
+      itemId: undefined, // 物料ID
+      itemType: undefined, // 物料类型
     };
   },
-  computed: {
+  methods: {
-    ...mapState({
+    onItemChange(item) {
-      rawMaterialMap: state => state.category.rawMaterialMap,
+      // 选中后构造条码数据并插入
-      productMap: state => state.category.productMap
+      console.log(item);
-    }),
+      const itemType = this.itemType;
-    // 策略标签映射
+      const name = (itemType == 'semi' || itemType == 'product') ? item.productName : item.rawMaterialName;
-    strategyLabels() {
+      const code = (itemType == 'semi' || itemType == 'product') ? item.productCode : item.rawMaterialCode;
-      return Object.keys(strategyMetadata).reduce((obj, key) => {
+      const o = {
-        obj[key] = strategyMetadata[key].label;
+        code: encodeURIComponent(`${itemType}__${item.itemId || ''}`),
-        return obj;
+        count: 1,
-      }, {});
+        textTpl: `${name}[${code}]`
-    },
-    // 当前策略对应的列表数据
-    currentList() {
-      return this[strategyMetadata[this.currentStrategy].listKey] || [];
-    },
-    // 当前策略的主键字段
-    keyField() {
-      return strategyMetadata[this.currentStrategy].keyField;
-    },
-    // 当前策略的显示字段
-    labelField() {
-      return strategyMetadata[this.currentStrategy].labelField;
-    }
-  },
-  watch: {
-    // 策略切换时的处理
-    currentStrategy: {
-      handler(newVal) {
-        this.currentId = ''; // 清空选择
-        this.drawerBarcodeData = []; // 清空条码数据
-        // 加载对应策略的列表数据
-        if (strategies[newVal]?.list) {
-          strategies[newVal].list(this);
-        }
-      },
-      immediate: true // 初始化时执行
-    },
-    // 选中项变化时的处理
-    currentId(newVal) {
-      if (!newVal) {
-        this.drawerBarcodeData = [];
-        return;
-      }
-      // 获取对应策略的条码数据
-      if (strategies[this.currentStrategy]?.getBarcodeData) {
-        strategies[this.currentStrategy].getBarcodeData(this);
       }
+      this.drawerBarcodeData.push(o);
+    },
+    handleDelete(cfg, idx) {
+      console.log(cfg, idx);
+      this.drawerBarcodeData.splice(idx, 1);
     }
   }
 };
 </script>
 
 <style scoped lang="scss">
-.print-container {
-  margin-top: 20px;
-  padding: 20px;
-}
 </style>

klp-ui/src/views/wms/product/index.vue

@@ -20,7 +20,7 @@
       <el-form-item label="负责人" prop="salesManager">
         <el-input v-model="queryParams.owner" :multiple="false" placeholder="请填写负责人" />
       </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">
@@ -41,7 +41,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -99,7 +99,7 @@
       <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>
@@ -121,7 +121,7 @@
       </el-table-column>
       <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="innerDiameter" /> -->
       <el-table-column label="计量单位" align="center" prop="unit" />
       <el-table-column label="是否启用" align="center" prop="isEnabled">
         <template slot-scope="scope">
@@ -174,7 +174,7 @@
     <!-- 添加或修改产品对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-divider>基础信息</el-divider>
+        <!-- <el-divider>基础信息</el-divider> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="产品编号" prop="productCode">
@@ -198,7 +198,7 @@
           </el-col>
         </el-row>
 
-        <el-divider>分类信息</el-divider>
+        <!-- <el-divider>分类信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="基础材质" prop="baseMaterialId">
@@ -251,7 +251,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

klp-ui/src/views/wms/product/semi.vue

@@ -20,7 +20,7 @@
       <el-form-item label="负责人" prop="salesManager">
         <el-input v-model="queryParams.owner" :multiple="false" placeholder="请填写负责人" />
       </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">
@@ -41,7 +41,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -99,7 +99,7 @@
       <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>
@@ -121,13 +121,13 @@
       </el-table-column>
       <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="innerDiameter" /> -->
       <el-table-column label="计量单位" align="center" prop="unit" />
-      <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> -->
       <el-table-column label="BOM" align="center">
         <template slot-scope="scope">
           <BomInfoMini :bomId="scope.row.bomId" />
@@ -174,7 +174,7 @@
     <!-- 添加或修改半成品对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-divider>基础信息</el-divider>
+        <!-- <el-divider>基础信息</el-divider> -->
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="半成品编号" prop="productCode">
@@ -198,7 +198,7 @@
           </el-col>
         </el-row>
 
-        <el-divider>分类信息</el-divider>
+        <!-- <el-divider>分类信息</el-divider>
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="基础材质" prop="baseMaterialId">
@@ -251,7 +251,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>

klp-ui/src/views/wms/purchasePlan/panels/detail.vue

@@ -151,7 +151,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="原材料" prop="rawMaterialId">
-          <RawMaterialSelect v-model="form.rawMaterialId" placeholder="请选择原材料" @change="onRawMaterialChange" />
+          <RawMaterialSelect v-model="form.rawMaterialId" placeholder="请选择原材料" @change="onRawMaterialChange" can-add />
         </el-form-item>
         <el-form-item label="负责人" prop="owner">
           <el-input v-model="form.owner" placeholder="请输入负责人" />

klp-ui/src/views/wms/rawMaterial/index.vue

@@ -17,7 +17,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="钢种/牌号" prop="steelGrade">
+      <!-- <el-form-item label="钢种/牌号" prop="steelGrade">
         <el-input
           v-model="queryParams.steelGrade"
           placeholder="请输入钢种/牌号"
@@ -48,7 +48,7 @@
           placeholder="请选择表面处理分类"
           clearable
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="是否启用" prop="isEnabled">
         <el-select v-model="queryParams.isEnabled" placeholder="请选择是否启用" clearable>
           <el-option
@@ -114,7 +114,7 @@
       <el-table-column label="原材料编号" align="center" prop="rawMaterialCode" />
       <el-table-column label="原材料名称" align="center" prop="rawMaterialName" />
       <el-table-column label="计量单位" align="center" prop="unit" />
-      <el-table-column label="钢种/牌号" align="center" prop="steelGrade" />
+      <!-- <el-table-column label="钢种/牌号" align="center" prop="steelGrade" /> -->
       <!-- <el-table-column label="目标冷轧牌号" align="center" prop="targetColdGrade" />
       <el-table-column label="基础材质分类" align="center">
         <template slot-scope="scope">

klp-ui/src/views/wms/stockIo/panels/barcode.vue

@@ -62,6 +62,14 @@
                 >
                   另存为图片
                 </el-button>
+                <el-button 
+                  type="text" 
+                  size="mini" 
+                  @click="handleDelete(cfg, idx)"
+                  icon="el-icon-delete"
+                >
+                  删除
+                </el-button>
               </div>
               <el-form-item label="二维码内容" label-width="70px" style="margin-bottom: 8px;">
                 <el-input disabled type="textarea" v-model="cfg.code" size="mini" :autosize="{ minRows: 1, maxRows: 3 }" placeholder="请输入条码内容" />
@@ -196,6 +204,10 @@ export default {
       }
       return code;
     },
+    handleDelete(cfg, idx) {
+      // this.barcodeConfigs.splice(idx, 1);
+      this.$emit('delete', cfg, idx);
+    },
     getPaperPx() {
       // mm to px, 1mm ≈ 3.78px
       let width, height;

klp-ui/src/views/wms/stockIo/panels/detail.vue

@@ -229,7 +229,7 @@ export default {
     SemiSelect,
     MaterialSelect
   },
-  dicts: ['stock_item_type', 'stock_biz_type'],
+  dicts: ['stock_item_type', 'stock_biz_type', 'stock_io_type'],
   props: {
     stockIo: {
       type: Object,

klp-ui/src/views/wms/stockIo/panels/stockIoPage.vue

@@ -44,7 +44,7 @@
 
     <el-table v-loading="loading" :data="stockIoList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="出入库单ID" align="center" prop="stockIoId" v-if="true" />
+      <el-table-column label="出入库单ID" align="center" prop="stockIoId" v-if="false" />
       <el-table-column label="出入库单号" align="center" prop="stockIoCode" />
       <el-table-column label="类型" align="center" prop="ioType">
         <template slot-scope="scope">
@@ -67,6 +67,8 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" />
+      <el-table-column label="创建人" align="center" prop="createBy" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
@@ -124,7 +126,7 @@ import ReturnCreatePanel from './returnCreate.vue';
 
 export default {
   name: "StockIo",
-  dicts: ['stock_biz_type', 'stock_status'],
+  dicts: ['stock_biz_type', 'stock_status', 'stock_io_type'],
   components: { StockIoDetailPanel, ReturnCreatePanel },
   props: {
     ioType: {