ysy 2 лет назад
Родитель
Сommit
a118d05a10

+ 6 - 10
src/views/inspectionClassify/components/user-edit.vue

@@ -1,33 +1,29 @@
 <!-- 用户编辑弹窗 -->
 <template>
   <ele-modal width="60%" :visible="visible" :append-to-body="true" :close-on-click-modal="true"
-    custom-class="ele-dialog-form" :title="isUpdate ? '修改干燥区' : '新增干燥区'" @update:visible="updateVisible">
+    custom-class="ele-dialog-form" :title="isUpdate ? '修改质检' : '新增质检'" @update:visible="updateVisible">
     <el-form ref="form" :model="form" :rules="rules" label-width="100px">
 
       <el-row>
         <el-col :span="12">
-          <el-form-item label="干燥区编码:" prop="code">
-            <el-input clearable :disabled="true" v-model="form.code" placeholder="干燥区编码" />
+          <el-form-item label="质检类型:" prop="categoryLevelName">
+            <el-input v-model="form.categoryLevelName" @click.native="openCategory" readonly />
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="干燥区名称:" prop="name">
+          <el-form-item label="质检名称:" prop="name">
             <el-input clearable v-model="form.name" placeholder="请输入干燥区名称" />
           </el-form-item>
         </el-col>
 
-        <el-col :span="12">
-          <el-form-item label="分类:" prop="categoryLevelName">
-            <el-input v-model="form.categoryLevelName" @click.native="openCategory" readonly />
-          </el-form-item>
-        </el-col>
+  
 
 
 
 
         <el-col :span="12">
-          <el-form-item label="规格:" prop="specification">
+          <el-form-item label="工序:" prop="specification">
             <el-input clearable v-model="form.specification" placeholder="请输入规格" />
           </el-form-item>
         </el-col>

+ 26 - 14
src/views/inspectionClassify/components/user-list.vue

@@ -12,9 +12,12 @@
         </el-button>
       </template>
       <!-- 编码列 -->
+
+
       <template v-slot:status="{ row }">
-        <!-- 0空闲1占用 -->
-        {{ row.status == 0 ? '空闲' : row.status == 1 ? '占用' : '' }}
+        <el-switch v-model="row.status" active-color="#13ce66" inactive-color="#ff4949" :active-value="1"
+          :inactive-value="0" @change="changeEnable(row)">
+        </el-switch>
       </template>
 
 
@@ -72,23 +75,17 @@ export default {
           showOverflowTooltip: true,
           fixed: 'left'
         },
-        {
-          prop: 'code',
-          label: '干燥区编码',
-          showOverflowTooltip: true,
-          minWidth: 110,
 
-        },
         {
           prop: 'name',
-          label: '干燥区名称',
+          label: '质检名称',
           showOverflowTooltip: true,
           minWidth: 110
         },
 
         {
           prop: 'specification',
-          label: '规格',
+          label: '工序',
           showOverflowTooltip: true,
           minWidth: 110
         },
@@ -96,16 +93,26 @@ export default {
 
         {
           prop: 'region',
-          label: '位置',
+          label: '产品类型',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
+
+        {
+          prop: 'code',
+          label: '产品类型编码',
           showOverflowTooltip: true,
           minWidth: 110
         },
+
         {
           prop: 'status',
           label: '状态',
-          showOverflowTooltip: true,
-          minWidth: 110,
+          align: 'center',
+          width: 80,
+          resizable: false,
           slot: 'status',
+          showOverflowTooltip: true
         },
 
         {
@@ -160,7 +167,12 @@ export default {
         .catch((e) => {
           loading.close();
         });
-    }
+    },
+
+    async changeEnable(row) {
+      console.log(row)
+    },
+
 
 
   },

+ 54 - 56
src/views/inspectionClassify/components/user-search.vue

@@ -1,44 +1,30 @@
 <!-- 搜索表单 -->
 <template>
-  <el-form
-    label-width="50px"
-    class="ele-form-search"
-    @keyup.enter.native="search"
-    @submit.native.prevent
-  >
+  <el-form label-width="77px" class="ele-form-search" @keyup.enter.native="search" @submit.native.prevent>
     <el-row :gutter="15">
+
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="编码:">
-          <el-input clearable v-model="where.code" placeholder="请输入" />
-        </el-form-item>
-      </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="名称:">
+        <el-form-item label="质检名称:">
           <el-input clearable v-model="where.name" placeholder="请输入" />
         </el-form-item>
       </el-col>
 
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
-        <el-form-item label="规格:">
-          <el-input clearable v-model="where.specification" placeholder="请输入" />
+        <el-form-item label="状态:">
+
+          <el-select clearable class="ele-block" v-model="where.status" placeholder="请选择状态">
+            <el-option v-for="item in statusList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+
         </el-form-item>
       </el-col>
       <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
         <el-form-item label-width="50px">
-          <el-button
-            type="primary"
-            icon="el-icon-search"
-            class="ele-btn-icon"
-            @click="search"
-            size="small"
-          >
+          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search" size="small">
             查询
           </el-button>
-          <el-button @click="reset"
-            icon="el-icon-refresh-left"
-            size="small"
-            type="primary"
-          >重置</el-button>
+          <el-button @click="reset" icon="el-icon-refresh-left" size="small" type="primary">重置</el-button>
         </el-form-item>
       </el-col>
     </el-row>
@@ -46,36 +32,48 @@
 </template>
 
 <script>
-  export default {
-    data() {
-      // 默认表单数据
-      const defaultWhere = {
-        name: '',
-        code: '',
-        specification:''
-      };
-      return {
-        // 表单数据
-        where: { ...defaultWhere }
-      };
-    },
-    computed: {
-      // 是否开启响应式布局
-      styleResponsive() {
-        return this.$store.state.theme.styleResponsive;
-      }
+export default {
+  data() {
+    // 默认表单数据
+    const defaultWhere = {
+      name: '',
+      status: ''
+    };
+
+
+    return {
+      // 表单数据
+      where: { ...defaultWhere },
+
+      statusList: [
+        {
+          value: 0,
+          label: '停用'
+        },
+        {
+          value: 1,
+          label: '启用'
+        }
+      ]
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    /* 搜索 */
+    search() {
+      console.log(this.where);
+      this.$emit('search', this.where);
     },
-    methods: {
-      /* 搜索 */
-      search() {
-        console.log(this.where);
-        this.$emit('search', this.where);
-      },
-      /*  重置 */
-      reset() {
-        this.where = { ...this.defaultWhere };
-        this.search();
-      }
+    /*  重置 */
+    reset() {
+      this.where = { ...this.defaultWhere };
+      this.search();
     }
-  };
+  }
+};
 </script>

+ 1 - 1
src/views/inspectionClassify/index.vue

@@ -31,7 +31,7 @@ export default {
       // 表格选中数据
       selection: [],
       current: null,
-      rootId: 11
+      rootId: 12
     };
   },
   computed: {},