物料基本信息管理修改

ruoyi-ui/src/views/bas/basProduct/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="物料编号" prop="productId">
+      <el-form-item label="物料编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入物料编号"
+          placeholder="请输入物料编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -17,34 +17,66 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="英文描述" prop="spare1">
+      <el-form-item label="序列号" prop="spare4">
+        <el-input
+          v-model="queryParams.spare4"
+          placeholder="请输入序列号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="相位" prop="spare7">
+        <el-input
+          v-model="queryParams.spare7"
+          placeholder="请输入相位"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="型号" prop="spare1">
         <el-input
           v-model="queryParams.spare1"
-          placeholder="请输入英文描述"
+          placeholder="请输入型号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="单位" prop="unit">
+      <el-form-item label="净重" prop="spare2">
         <el-input
-          v-model="queryParams.unit"
-          placeholder="请输入单位"
+          v-model="queryParams.spare2"
+          placeholder="请输入净重"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="价格" prop="price">
+      <el-form-item label="毛重" prop="spare8">
         <el-input
-          v-model="queryParams.price"
-          placeholder="请输入价格"
+          v-model="queryParams.spare8"
+          placeholder="请输入毛重"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="描述" prop="remark">
+      <el-form-item label="颜色" prop="spare3">
         <el-input
-          v-model="queryParams.remark"
-          placeholder="请输入描述"
+          v-model="queryParams.spare3"
+          placeholder="请输入颜色"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="电压" prop="spare5">
+        <el-input
+          v-model="queryParams.spare5"
+          placeholder="请输入电压"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="功率" prop="spare6">
+        <el-input
+          v-model="queryParams.spare6"
+          placeholder="请输入功率"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -101,20 +133,21 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="BasProductList" @selection-change="handleSelectionChange" max-height="650">
+    <el-table v-loading="loading" :data="BasProductList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="物料编号" align="left" prop="productId"  />
-      <el-table-column label="物料名称" align="left" prop="productName" />
-      <el-table-column label="英文描述" align="left" prop="spare1"  />
-      <el-table-column label="单位" align="left" prop="unit" />
-      <el-table-column label="净重(KG)" align="right" prop="spare2" />
-      <el-table-column label="长度(MM)" align="right" prop="spare5"  />
-      <el-table-column label="宽度(MM)" align="right" prop="spare6" />
-      <el-table-column label="高度(MM)" align="right" prop="spare7"/>
-      <el-table-column label="体积(m³)" align="right" prop="spare8" />
-      <el-table-column label="价格" align="right" prop="price" />
-      <el-table-column label="描述" align="left" prop="remark"/>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" >
+      <el-table-column label="主键" align="center" prop="productGuid" />
+      <el-table-column label="物料编码" align="center" prop="productId" />
+      <el-table-column label="物料名称" align="center" prop="productName" />
+      <el-table-column label="序列号" align="center" prop="spare4" />
+      <el-table-column label="相位" align="center" prop="spare7" />
+      <el-table-column label="型号" align="center" prop="spare1" />
+      <el-table-column label="净重" align="center" prop="spare2" />
+      <el-table-column label="毛重" align="center" prop="spare8" />
+      <el-table-column label="颜色" align="center" prop="spare3" />
+      <el-table-column label="电压" align="center" prop="spare5" />
+      <el-table-column label="功率" align="center" prop="spare6" />
+      <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"
@@ -133,7 +166,7 @@
         </template>
       </el-table-column>
     </el-table>
-
+    
     <pagination
       v-show="total>0"
       :total="total"
@@ -142,46 +175,46 @@
       @pagination="getList"
     />
 
-    <!-- Add or Edit Product Dialog -->
+    <!-- 添加或修改物料信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px" style="max-height: 500px; overflow-y: auto;">
-        <el-form-item label="物料编号" prop="productId">
-          <el-input v-model="form.productId" placeholder="请输入物料编号" />
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="物料编码" prop="productId">
+          <el-input v-model="form.productId" 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="spare1">
-          <el-input v-model="form.spare1" placeholder="请输入英文描述" />
+        <el-form-item label="序列号" prop="spare4">
+          <el-input v-model="form.spare4" placeholder="请输入序列号" />
         </el-form-item>
-        <el-form-item label="单位" prop="unit">
-          <el-input v-model="form.unit" placeholder="请输入单位" />
+        <el-form-item label="相位" prop="spare7">
+          <el-input v-model="form.spare7" placeholder="请输入相位" />
         </el-form-item>
-        <el-form-item label="净重(KG)" prop="spare2">
+        <el-form-item label="型号" prop="spare1">
+          <el-input v-model="form.spare1" placeholder="请输入型号" />
+        </el-form-item>
+        <el-form-item label="净重" prop="spare2">
           <el-input v-model="form.spare2" placeholder="请输入净重" />
         </el-form-item>
-        <el-form-item label="长度(MM)" prop="spare5">
-          <el-input v-model="form.spare5" placeholder="请输入长度" />
+        <el-form-item label="毛重" prop="spare8">
+          <el-input v-model="form.spare8" placeholder="请输入毛重" />
         </el-form-item>
-        <el-form-item label="宽度(MM)" prop="spare6">
-          <el-input v-model="form.spare6" placeholder="请输入宽度" />
+        <el-form-item label="颜色" prop="spare3">
+          <el-input v-model="form.spare3" placeholder="请输入颜色" />
         </el-form-item>
-        <el-form-item label="高度(MM)" prop="spare7">
-          <el-input v-model="form.spare7" placeholder="请输入高度" />
+        <el-form-item label="电压" prop="spare5">
+          <el-input v-model="form.spare5" placeholder="请输入电压" />
         </el-form-item>
-        <el-form-item label="体积(m³)" prop="spare8">
-          <el-input v-model="form.spare8" placeholder="请输入体积" />
+        <el-form-item label="功率" prop="spare6">
+          <el-input v-model="form.spare6" placeholder="请输入功率" />
         </el-form-item>
-        <el-form-item label="价格" prop="price">
-          <el-input v-model="form.price" placeholder="请输入价格" />
-        </el-form-item>
-        <el-form-item label="描述" prop="remark">
-          <el-input v-model="form.remark" placeholder="请输入描述" />
+        <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 type="primary" @click="submitForm">确定</el-button>
-        <el-button @click="cancel">取消</el-button>
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
   </div>
@@ -206,7 +239,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 物料管理表格数据
+      // 物料信息表格数据
       BasProductList: [],
       // 弹出层标题
       title: "",
@@ -217,74 +250,28 @@ export default {
         pageNum: 1,
         pageSize: 10,
         productId: null,
-        parentId: null,
-        price: null,
-        cargoNo: null,
-        unit: null,
-        spec: null,
-        remark: null,
+        productName: null,
+        spare4: null,
+        spare7: null,
         spare1: null,
         spare2: null,
+        spare8: null,
         spare3: null,
-        spare4: null,
         spare5: null,
         spare6: null,
-        productName: null
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
-        productId: [
-          { required: true, message: "请输入物料编号", trigger: "blur" }
-        ],
-        productName: [
-          { required: true, message: "请输入物料名称", trigger: "blur" }
-        ],
-        unit: [
-          { required: true, message: "请输入单位", trigger: "blur" }
-        ],
-        price: [
-          { required: true, message: "请输入价格", trigger: "blur" }
-        ]
       }
     }
   },
-  watch: {
-    'form.spare2': {
-      handler(val) {
-        if (val) {
-          // 单件净重变化时，自动计算总净重
-          const netWeight = parseFloat(val || 0);
-          this.form.spare8 = netWeight.toString();
-          // 如果毛重小于净重，自动更新毛重
-          const grossWeight = parseFloat(this.form.spare9 || 0);
-          if (grossWeight < netWeight) {
-            this.form.spare9 = netWeight.toString();
-          }
-        }
-      },
-      immediate: true
-    },
-    'form.spare8': {
-      handler(val) {
-        if (val) {
-          // 总净重变化时，如果毛重小于净重，自动更新毛重
-          const netWeight = parseFloat(val || 0);
-          const grossWeight = parseFloat(this.form.spare9 || 0);
-          if (grossWeight < netWeight) {
-            this.form.spare9 = netWeight.toString();
-          }
-        }
-      },
-      immediate: true
-    }
-  },
   created() {
     this.getList()
   },
   methods: {
-    /** 查询物料管理列表 */
+    /** 查询物料信息列表 */
     getList() {
       this.loading = true
       listBasProduct(this.queryParams).then(response => {
@@ -304,18 +291,21 @@ export default {
         productGuid: null,
         productId: null,
         productName: null,
-        spare1: null,
-        unit: null,
-        spare2: null,
-        spare3: null,
         spare4: null,
+        spare7: null,
+        spare1: null,
+        spare2: null,
+        spare8: null,
+        spare3: null,
         spare5: null,
         spare6: null,
-        spare7: null,
-        spare8: null,
-        spare9: null,
+        remark: null,
+        parentId: null,
         price: null,
-        remark: null
+        cargoNo: null,
+        unit: null,
+        spec: null,
+        spare9: null
       }
       this.resetForm("form")
     },
@@ -339,7 +329,7 @@ export default {
     handleAdd() {
       this.reset()
       this.open = true
-      this.title = "添加物料"
+      this.title = "添加物料信息"
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -348,7 +338,7 @@ export default {
       getBasProduct(productGuid).then(response => {
         this.form = response.data
         this.open = true
-        this.title = "修改物料"
+        this.title = "修改物料信息"
       })
     },
     /** 提交按钮 */
@@ -363,7 +353,7 @@ export default {
             })
           } else {
             addBasProduct(this.form).then(response => {
-              this.$modal.msgSuccess("添加成功")
+              this.$modal.msgSuccess("新增成功")
               this.open = false
               this.getList()
             })
@@ -374,7 +364,7 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const productGuids = row.productGuid || this.ids
-      this.$modal.confirm("是否确认删除所选物料？").then(function() {
+      this.$modal.confirm('是否确认删除物料信息编号为"' + productGuids + '"的数据项？').then(function() {
         return delBasProduct(productGuids)
       }).then(() => {
         this.getList()