优化

src/views/material/materialBOM/components/edit-dialog.vue

@@ -231,7 +231,7 @@ export default {
           action: 'categoryName'
         },
         {
-          label: '是否反工料',
+          label: '是否回收料',
           prop: 'isReworkBom',
           slot: 'isReworkBom',
           action: 'isReworkBom'

src/views/material/product/components/MaterialAdd.vue

@@ -223,7 +223,7 @@ export default {
                     action: 'categoryName'
                 },
                 {
-                    label: '是否反工料',
+                    label: '是否回收料',
                     prop: 'isReworkBom',
                     slot: 'isReworkBom',
                     action: 'isReworkBom'

src/views/material/product/components/MaterialModal.vue

@@ -240,7 +240,7 @@ export default {
                 },
 
                 {
-                    label: '是否反工料',
+                    label: '是否回收料',
                     prop: 'isReworkBom',
                     action: 'isReworkBom',
                     slot: 'isReworkBom',
@@ -268,10 +268,7 @@ export default {
                     prop: 'unit'
                 },
 
-                {
-                    label: '数量',
-                    prop: 'netWeight'
-                },
+         
                 {
                     label: '单位',
                     prop: 'weightUnit'

src/views/material/product/components/TurnoverInfo.vue

@@ -9,17 +9,6 @@
         <div class="ele-bg-primary ele-width"></div>
       </div>
       <el-row :gutter="24">
-        <el-col :span="8">
-          <el-form-item label="层数" prop="levelNum">
-            <el-input v-model="form.levelNum" />
-          </el-form-item>
-        </el-col>
-
-        <el-col :span="8">
-          <el-form-item label="列数" prop="lineNum">
-            <el-input v-model="form.lineNum" />
-          </el-form-item>
-        </el-col>
 
         <el-col :span="8">
           <el-form-item label="材质" prop="materialQuality">
@@ -32,27 +21,7 @@
             <!-- <el-input  v-model="form.materialQuality"/> -->
           </el-form-item>
         </el-col>
-        <el-col :span="8">
-          <el-form-item label="长" prop="vehicleLen">
-            <el-input v-model="form.vehicleLen">
-              <template slot="append">mm</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="宽" prop="wilde">
-            <el-input v-model="form.wilde">
-              <template slot="append">mm</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="高" prop="hight">
-            <el-input v-model="form.hight">
-              <template slot="append">mm</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
+    
       </el-row>
     </el-form>
   </div>

src/views/material/product/components/goodsAllocation.vue

@@ -0,0 +1,167 @@
+<template>
+  <ele-modal :visible.sync="visible" title="货位管理" width="60%" @close="cancel">
+
+
+    <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="层数" prop="levelNum">
+            <el-input v-model="form.levelNum" />
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="列数" prop="lineNum">
+            <el-input v-model="form.lineNum" />
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item label="长" prop="vehicleLen">
+            <el-input v-model="form.vehicleLen">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="宽" prop="wilde">
+            <el-input v-model="form.wilde">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="高" prop="hight">
+            <el-input v-model="form.hight">
+              <template slot="append">mm</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="8">
+          <el-form-item>
+            <el-button size="small" type="primary" @click="handleHjCode">生成货位</el-button>
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+    </el-form>
+
+
+
+
+
+    <div slot="footer" class="footer">
+      <el-button type="primary" @click="save">保存</el-button>
+      <el-button @click="cancel">取消</el-button>
+    </div>
+
+
+    <!-- 规则货架编号 -->
+    <el-dialog title="规则货架编号" append-to-body :visible.sync="hjCodeFalg" width="20%">
+      <el-form :model="hjForm">
+        <el-form-item label="规则类型" label-width="100px">
+          <el-radio-group v-model="hjForm.type">
+            <el-radio :label="1">字母</el-radio>
+            <el-radio :label="2">字母+数字</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="规则名称定义" label-width="100px">
+          <el-input v-model="hjForm.code" @input="handleInput"></el-input>
+          <span style="color: #dab8b8">注：只可输入大写A-Z</span>
+        </el-form-item>
+      </el-form>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="hjCodeFalg = false">取 消</el-button>
+        <el-button @click="handleMine" type="primary">确 定</el-button>
+      </span>
+    </el-dialog>
+
+
+  </ele-modal>
+</template>
+  
+<script>
+
+export default {
+
+  data() {
+    return {
+      visible: false,
+
+      form: {
+        levelNum: null,
+        lineNum: null,
+
+
+      },
+
+      hjCodeFalg: false,
+
+      hjForm: { code: '', type: 1 },
+
+      rules: {
+        levelNum: [
+          { required: true, message: '请输入层数', trigger: 'blur' }
+        ],
+        lineNum: [
+          { required: true, message: '请输入列数', trigger: 'blur' }
+        ],
+      }
+    };
+  },
+  created() {
+
+  },
+  computed: {
+
+
+
+
+  },
+  methods: {
+    open() {
+      this.visible = true;
+    },
+    cancel() {
+      this.visible = false;
+
+    },
+
+    handleHjCode() {
+
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          this.hjCodeFalg = true;
+        }
+      })
+
+
+    },
+
+    handleMine() {
+      let preCode = 0;
+      let codeEng = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+      let currentLetterIndex = 0;
+    },
+
+    save() {
+
+    }
+
+
+
+
+  }
+};
+</script>
+  
+<style lang="scss" scoped>
+.el-form-item {
+  margin-bottom: 20px !important;
+}
+</style>
+  

src/views/material/product/components/index-data.vue

@@ -33,15 +33,15 @@
 
       </template>
       <template v-slot:action="{ row }">
-        <el-link type="primary" :underline="false" icon="el-icon-copy-document" @click="openEdit(row, 1)">
+        <el-link type="primary" :underline="false" @click="openEdit(row, 1)">
           复制
         </el-link>
-        <el-link type="primary" :underline="false" icon="el-icon-edit" @click="openEdit(row, 0)">
+        <el-link type="primary" :underline="false"  @click="openEdit(row, 0)">
           修改
         </el-link>
         <el-popconfirm class="ele-action" title="确定要删除此物料吗？" @confirm="remove(row)">
           <template v-slot:reference>
-            <el-link type="danger" :underline="false" icon="el-icon-delete">
+            <el-link type="danger" :underline="false" >
               删除
             </el-link>
           </template>
@@ -63,6 +63,11 @@
         </el-link>
 
 
+        <el-link  type="primary" v-if="row.categoryLevelPathIdParent == 7" :underline="false"  @click="handAllocation(row)" >
+          货位
+        </el-link>
+
+
       </template>
     </ele-pro-table>
     <!-- 编辑弹窗 -->
@@ -79,6 +84,8 @@
 
     <linkMaterialDialog ref="linkMaterialDialogRef" @success="success" />
 
+    <goodsAllocation ref="allocationRef"></goodsAllocation>
+
   </div>
 </template>
 
@@ -88,12 +95,14 @@ import MaterialModal from './MaterialModal.vue'
 import ParamEdit from '@/views/technology/productParam/components/user-edit.vue'
 import mouldDialog from './mouldDialog'
 import linkMaterialDialog from './link-material-dialog.vue';
+import goodsAllocation from './goodsAllocation.vue'
 export default {
   components: {
     MaterialModal,
     ParamEdit,
     mouldDialog,
-    linkMaterialDialog
+    linkMaterialDialog,
+    goodsAllocation
   },
   props: {
     // 物料组id
@@ -211,7 +220,9 @@ export default {
       mouldShow: false,
       current: null,
 
-      rowCurrent: null
+      rowCurrent: null,
+
+  
 
     };
   },
@@ -297,6 +308,11 @@ export default {
       },
 
 
+      handAllocation(row) {
+        this.$refs.allocationRef.open(row)
+      }
+
+
 
   },
   watch: {

src/views/technology/route/components/user-edit.vue

@@ -65,7 +65,7 @@
 
 
 
-      </el-row>
+      </el-row>``
 
     </el-form>