Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

klp-ui/src/views/cost/item.vue

@@ -42,6 +42,17 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="产线" prop="productionLineId">
+        <el-select
+          v-model="queryParams.productionLineId"
+          placeholder="请选择产线"
+          clearable
+          filterable
+          @change="handleQuery"
+        >
+          <el-option v-for="l in lineOptions" :key="l.lineId" :label="l.lineName" :value="l.lineId" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="查询条件" prop="queryCondition">
         <el-input
           v-model="queryParams.queryCondition"
@@ -105,6 +116,7 @@
       <el-table-column label="成本项目名称" align="center" prop="itemName" />
       <el-table-column label="成本分类" align="center" prop="category" />
       <el-table-column label="计量单位" align="center" prop="unit" />
+      <el-table-column label="产线" align="center" prop="productionLineName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="查询条件" align="center" prop="queryCondition" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -157,6 +169,11 @@
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
+        <el-form-item label="产线" prop="productionLineId">
+          <el-select v-model="form.productionLineId" placeholder="请选择产线" clearable filterable style="width:100%">
+            <el-option v-for="l in lineOptions" :key="l.lineId" :label="l.lineName" :value="l.lineId" />
+          </el-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" placeholder="请输入备注" />
         </el-form-item>
@@ -174,6 +191,7 @@
 
 <script>
 import { listItem, getItem, delItem, addItem, updateItem } from "@/api/cost/item";
+import { listProductionLine } from "@/api/wms/productionLine";
 
 export default {
   name: "Item",
@@ -195,6 +213,7 @@ export default {
       total: 0,
       // 成本项目配置表格数据
       itemList: [],
+      lineOptions: [],
       // 弹出层标题
       title: "",
       // 是否显示弹出层
@@ -207,6 +226,7 @@ export default {
         itemName: undefined,
         category: undefined,
         unit: undefined,
+        productionLineId: undefined,
         queryCondition: undefined,
       },
       // 表单参数
@@ -217,9 +237,15 @@ export default {
     };
   },
   created() {
+    this.loadLines();
     this.getList();
   },
   methods: {
+    loadLines() {
+      listProductionLine({ pageSize: 9999 }).then(res => {
+        this.lineOptions = res.rows || [];
+      });
+    },
     /** 查询成本项目配置列表 */
     getList() {
       this.loading = true;
@@ -242,6 +268,7 @@ export default {
         itemName: undefined,
         category: undefined,
         unit: undefined,
+        productionLineId: undefined,
         remark: undefined,
         queryCondition: undefined,
         delFlag: undefined,