66

src/components/authSelection/index.vue

@@ -6,6 +6,7 @@
       v-model="selectVal"
       valueKey="id"
       labelKey="name"
+      :size="size"
       :show-checkbox="true"
       :check-strictly="true"
       multiple
@@ -33,6 +34,10 @@
       dataType: {
         type: String,
         default: 'String'
+      },
+      size: {
+        type: String,
+        default: ''
       }
     },
     data() {

src/components/material/user-search.vue

@@ -61,7 +61,7 @@
             size="mini"
             >重置</el-button
           >
-<!-- 
+        <!-- 
           <el-button
             type="primary"
             icon="el-icon-refresh-left"
@@ -70,7 +70,6 @@
             :loading="loading"
           >刷新</el-button> -->
 
-          <slot></slot>
         </el-form-item>
       </el-col>
     </el-row>

src/enum/dict.js

@@ -84,8 +84,7 @@ export const reviewStatus = {
   3: '审核不通过'
 };
 //编码粗规则
-export const roughRule = [
-  {
+export const roughRule = [{
     label: '数字',
     value: 1
   },
@@ -107,27 +106,30 @@ export const roughRule = [
   }
 ]
 //编码细规则
-export const fineRule = [
-  {
+export const fineRule = [{
     label: '0-9',
     value: '1',
-    pid: '1', reg: '[0-9]'
+    pid: '1',
+    reg: '[0-9]'
   },
 
   {
     label: 'A-Z',
     value: '1',
-    pid: '2', reg: '[A-Z]'
+    pid: '2',
+    reg: '[A-Z]'
   },
   {
     label: 'a-z',
     value: '2',
-    pid: '2', reg: '[a-z]'
+    pid: '2',
+    reg: '[a-z]'
   },
   {
     label: 'A-Z或a-z',
     value: '3',
-    pid: '2', reg: '[A-Za-z]'
+    pid: '2',
+    reg: '[A-Za-z]'
   },
   {
     label: '0-9或A-Z',
@@ -138,7 +140,8 @@ export const fineRule = [
   {
     label: '0-9或a-z',
     value: '2',
-    pid: '3', reg: '[a-z0-9]'
+    pid: '3',
+    reg: '[a-z0-9]'
   },
   {
     label: '年份',
@@ -158,11 +161,13 @@ export const fineRule = [
   {
     label: '0-9',
     value: '1',
-    pid: '5', reg: '[0-9]'
+    pid: '5',
+    reg: '[0-9]'
   },
   {
     label: 'A-Z0-9',
     value: '2',
-    pid: '5', reg: '[A-Z0-9]'
+    pid: '5',
+    reg: '[A-Z0-9]'
   }
-];
+];

src/views/material/BOMmanage/components/BOM-search.vue

@@ -9,31 +9,34 @@
     <el-row :gutter="10">
 
 
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ?   { md: 5 } : { span: 5 }">
         <el-form-item label="编码">
           <el-input
+             size="mini"
             clearable
             v-model.trim="where.categoryCode"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ?   { md: 5 } : { span: 5 }">
         <el-form-item label="名称">
           <el-input
+             size="mini"
             clearable
             v-model.trim="where.categoryName"
             placeholder="请输入"
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { md: 6 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ?   { md: 5 } : { span: 5 }">
         <el-form-item label="状态">
           <el-select
             clearable
             v-model.trim="where.status"
             placeholder="请选择"
             class="w100"
+               size="mini"
           >
             <el-option
               v-for="item in Object.entries(statusOpt)"
@@ -44,27 +47,28 @@
           </el-select>
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+      <el-col v-bind="styleResponsive ? { lg: 5, md: 10 } : { span: 5}">
         <el-form-item label="组织机构:">
-          <auth-selection v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
+          <auth-selection size="mini" v-model.trim="where.deptIds" style="width: 100%"></auth-selection>
         </el-form-item>
       </el-col>
 
 
 
 
-      <el-col v-bind="styleResponsive ? { md: 12 } : { span: 12 }">
+      <el-col v-bind="styleResponsive ? { md: 4 } : { span: 4 }">
         <div class="ele-form-actions">
           <el-button
             type="primary"
             icon="el-icon-search"
             class="ele-btn-icon"
             @click="search"
+            size="mini"
           >
             查询
           </el-button>
 
-          <el-button @click="reset" icon="el-icon-refresh" class="ele-btn-icon"
+          <el-button @click="reset" icon="el-icon-refresh" class="ele-btn-icon"    size="mini"
             >重置</el-button
           >
         </div>

src/views/material/BOMmanage/components/baseInfo.vue

@@ -7,7 +7,6 @@
       
       <el-col :span="6" label-width="100px">
       <el-form-item label="类型" prop="type">
-
         {{ dataInfo.bomType == 1 ? "PBOM" :  dataInfo.bomType == 2 ? 'MBOM' :   dataInfo.bomType == 3 ? 'ABOM'  : ''}}
           </el-form-item>
           </el-col>
@@ -18,6 +17,7 @@
           <el-form-item label="BOM编码" prop="type">
             <el-input
               disabled
+              size="mini"
               placeholder="BOM编码"
               v-model="dataInfo.code"
             ></el-input>
@@ -26,6 +26,7 @@
         <el-col :span="6" label-width="100px">
           <el-form-item label="BOM名称" prop="type">
             <el-input
+                 size="mini"
               disabled
               placeholder="BOM名称"
               v-model="dataInfo.name"
@@ -35,6 +36,7 @@
         <el-col :span="6" label-width="100px">
           <el-form-item label="版本号" prop="type">
             <el-input
+                 size="mini"
               disabled
               placeholder="版本号"
               v-model="dataInfo.versions"
@@ -44,6 +46,7 @@
         <el-col :span="6" label-width="100px">
           <el-form-item label="状态" prop="type">
             <el-select
+                 size="mini"
               style="width: 100%"
               disabled
               v-model="dataInfo.status"
@@ -99,9 +102,9 @@
 
 <style lang="scss" scoped>
   .baseInfo {
-    padding: 6px;
+    padding: 2px;
     box-sizing: border-box;
     border: 1px solid #f1f2f2;
-    margin-bottom: 10px;
+    margin-bottom: 6px;
   }
 </style>

src/views/material/BOMmanage/components/detailedList.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ele-body">
-    <el-card shadow="never">
+ 
       <BOMSearch
         @search="reload"
         :statusOpt="statusOpt"
@@ -39,7 +39,7 @@
           </el-switch>
         </template>
       </ele-pro-table>
-    </el-card>
+
   </div>
 </template>
 

src/views/material/product/detail.vue

@@ -192,7 +192,7 @@
             <el-form-item :label="f.label">
               <template>
                 <div class="form-line">
-                  <component
+                  <component              
                     :is="f.tagType"
                     v-model="form.extField[f.prop]"
                     :disabled="f.extAttribute?.disabled"
@@ -277,7 +277,7 @@
   import { finishPageTab, reloadPageTab } from '@/utils/page-tab-util';
 
   export default {
-    name: 'ManageMaterial',
+    name: 'product',
     components: {
       linkMsg,
       GroupDialog,
@@ -382,7 +382,6 @@
     watch: {
       '$route.query.id': {
         handler(id) {
-          console.log('id-------------', id);
           if (id) {
             this._getDetails();
           } else {