优化

src/styles/index.scss

@@ -7,7 +7,6 @@ $--ele-font-path: '~ele-admin/es/style/fonts';
 
 
 
-
 /* 布局-横向 */
 /* c:center，s:start，e:end，a:around，b:between，w:wrap */
 .rx {

src/views/classifyManage/treeClassify/index.vue

@@ -71,10 +71,16 @@
             prop: 'name',
             label: '类型名称'
           },
+          {
+            prop: 'ruleCode',
+            label: '编码规则'
+          },
+
           {
             prop: 'remark',
             label: '描述'
           },
+
           {
             columnKey: 'action',
             label: '操作',

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

@@ -1,6 +1,6 @@
 <template>
   <ele-modal :title="title" :visible.sync="treeVisible" :before-close="handleClose" :close-on-click-modal="false"
-    :close-on-press-escape="false" append-to-body width="40%">
+    :close-on-press-escape="false" append-to-body width="30%">
     <div class="ele-border-lighter sys-organization-list">
       <el-tree :data="treeList" :props="defaultProps" v-loading="treeLoading" :node-key="nodeKey" ref="tree"
         :highlight-current="true" :expand-on-click-node="false" @node-click="handleNodeClick" v-bind="$attrs">
@@ -143,4 +143,13 @@ export default {
     margin-left: 10px;
   }
 }
+
+
+::v-deep .el-tree-node__content:hover{
+  background-color: #e6f7ff !important;
+}
+
+::v-deep .el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content {
+    background-color: #40a9ff !important;
+}
 </style>

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

@@ -1,42 +1,41 @@
 <template>
-    <ele-modal title="自定义编码" :visible.sync="visible" v-if="visible" :before-close="handleClose" :close-on-click-modal="false"
+    <ele-modal title="自定义编码" :visible.sync="visible" :before-close="handleClose" :close-on-click-modal="false"
         :close-on-press-escape="false" append-to-body width="40%">
-        <el-form label-width="120px" ref="formRef" :model="formData" :rules="rules">
+        <el-form label-width="120px" ref="formRef" :model="formData" :rules="rules" class="rx-sc">
 
-            <div class="row_flex">
 
 
-               <el-form-item label="" prop="leave">
-                    <el-input v-model="formData.leave" readonly style="width: 120px;margin-left: 8px;"></el-input>
-                </el-form-item>
+            <el-form-item label="">
+                <el-input v-model="formData.leave" readonly style="width: 120px;margin-left: 8px;"></el-input>
+            </el-form-item>
 
 
-                 <span>-</span>
-                <el-form-item label="" prop="leave2">
-                    <DictSelection :ChinEng="true" dictName="二级编码规则" clearable v-model="formData.leave2">
-                    </DictSelection>
-                </el-form-item>
-                <span>-</span>
+            <span>-</span>
+            <el-form-item label="" prop="leave2">
+                <DictSelection :ChinEng="true" dictName="二级编码规则" clearable v-model="formData.leave2">
+                </DictSelection>
+            </el-form-item>
+            <span>-</span>
 
-                <el-form-item label="" prop="leave3">
-                    <DictSelection :ChinEng="true" dictName="三级编码规则" clearable v-model="formData.leave3">
-                    </DictSelection>
-                </el-form-item>
-                <span>-</span> 
+            <el-form-item label="" prop="leave3">
+                <DictSelection :ChinEng="true" dictName="三级编码规则" clearable v-model="formData.leave3">
+                </DictSelection>
+            </el-form-item>
+            <span>-</span>
+
+            <el-form-item label="" prop="code">
+                <el-input v-model.number="formData.code" maxlength="4" placeholder="流水号"
+                    style="width: 120px;margin-left: 8px;"></el-input>
+            </el-form-item>
 
-                <el-form-item label="" prop="code">
-                    <el-input v-model.number="formData.code" maxlength="4" placeholder="流水号"
-                        style="width: 120px;margin-left: 8px;"></el-input>
-                </el-form-item> 
 
 
 
-            </div>
-            <div class="des">设备\模具\周转车\舟皿三级编码规则，例如：CX-JY-SB（本级）-0001 </div>
 
 
-        </el-form>
 
+        </el-form>
+        <div class="des">设备\模具\周转车\舟皿三级编码规则，例如：CX-JY-SB（本级）-0001 </div>
 
         <template v-slot:footer>
             <el-button @click="handleClose">取消</el-button>
@@ -53,7 +52,7 @@
 export default {
     data() {
         return {
-            visible: false,
+            visible: true,
             loading: false,
 
             formData: {
@@ -66,7 +65,13 @@ export default {
             rules: {
                 leave2: { required: true, message: '请选择', trigger: 'change' },
                 leave3: { required: true, message: '请选择', trigger: 'change' },
-                code: { required: true, message: '请输入流水号', trigger: 'blur' }
+                code: [
+                    { required: true, message: '请输入流水号', trigger: 'blur' },
+                    {
+                        pattern: /^\d{4}$/,
+                        message: '请输入四位数的流水号'
+                    }
+                ]
             }
         }
     },
@@ -75,22 +80,18 @@ export default {
 
     },
     methods: {
-        open() {
-            this.visible = true
-        },
+
         handleClose() {
-            this.visible = false
-            this.formData = null
-        },
+            this.$emit('close')
 
+        },
 
         save() {
-
             this.$refs.formRef.validate((valid) => {
                 if (!valid) {
                     return false;
                 }
-                let code = this.formData.leave   + '-' +  this.formData.leave2 + '-' +  this.formData.leave3 + '-' +  this.formData.code
+                let code = this.formData.leave + '-' + this.formData.leave2 + '-' + this.formData.leave3 + '-' + this.formData.code
                 this.$emit('chooseCode', code)
                 this.handleClose()
 

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

@@ -185,7 +185,7 @@
           pageNum: page,
           size: limit,
           ...where,
-          categoryLevelGroupId: this.currentId
+          categoryLevelId: this.currentId
         });
       },
       /* 刷新表格 */
@@ -193,7 +193,7 @@
         this.$refs.table.reload({
           page: 1,
           where: where,
-          categoryLevelGroupId: this.currentId
+          categoryLevelId: this.currentId
         });
       },
       /* 显示编辑 */

src/views/material/product/detail.vue

@@ -115,7 +115,7 @@
 
 
     <!--  自定义编码 -->
-    <CodeDialog ref="codeRefs"  @chooseCode="chooseCode"></CodeDialog>
+    <CodeDialog ref="codeRefs" v-if="codeShow" @close="codeShow= false"  @chooseCode="chooseCode"></CodeDialog>
     <!-- 分类选择弹窗 -->
     <CategoryDialog ref="categoryRefs" @chooseCategory="confirmCategory" />
     <!-- 仓储配置 -->
@@ -220,7 +220,8 @@ export default {
       PathInfo: {},
       id: null,
 
-      ruleCode: null
+      ruleCode: null,
+      codeShow: false
     };
   },
   async created() {
@@ -319,11 +320,12 @@ export default {
     },
 
     openCode() {
-      this.$refs.codeRefs.open()
+    this.codeShow =true
     },
 
     chooseCode(code) {
       this.$set(this.form, 'code', code);
+      this.codeShow = false
       this.$forceUpdate()
     },