ysy пре 2 година
родитељ
комит
02f1fc2a14

+ 2 - 3
src/api/inspectionClassify/index.js

@@ -4,9 +4,8 @@ import request from '@/utils/request';
 
 
 // 列表 
-export async function getList (data) {
-    let par = new URLSearchParams(data);
-    const res = await request.get(`/main/aridregion/page?` + par, {});
+export async function getList (params) {
+    const res = await request.get(`/main/aridregion/page?`, params);
     if (res.data.code == 0) {
       return res.data.data;
     }

+ 43 - 0
src/api/inspectionStandard/index.js

@@ -0,0 +1,43 @@
+import request from '@/utils/request';
+
+
+// 列表
+
+export async function getList (data) {
+    let par = new URLSearchParams(data);
+    const res = await request.get(`/qms/qualitystandard/page?` + par, {});
+    if (res.data.code == 0) {
+      return res.data.data;
+    }
+    return Promise.reject(new Error(res.data.message));
+  }
+
+// 新增
+export async function save(data) {
+  const res = await request.post(`/qms/qualitystandard/save`, data);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+// 编辑
+export async function update(data) {
+  const res = await request.put(`/qms/qualitystandard/update`, data);
+  if (res.data.code == 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
+// 删除
+export async function removeItem(data) {
+  const res = await request.delete('/qms/qualitystandard/delete', {
+    data
+  });
+  if (res.data.code == 0) {
+    return res.data.message;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

+ 3 - 17
src/enum/dict.js

@@ -5,18 +5,8 @@ export default {
   任务类型: 'taskCategory',
   流程分类: 'processCategory',
   角度: 'angle',
-  生命周期: 'life_cycle',
-  网络状态: 'network_status',
-  金额单位: 'money_unit',
-  时间单位: 'time_unit',
-  订单来源: 'order_source',
-  订单类型: 'order_type',
-  生产状态: 'production_status',
-  按单按库: 'order_library',
-  紧急程度: 'urgent_type',
-  订单计划类型: 'plan_type',
-  交付要求: 'require_ments',
-  交货状态: 'delivery_status'
+  质检标准类型: 'quality_testing_code',
+
 };
 
 export const numberList = [
@@ -24,9 +14,5 @@ export const numberList = [
   'patrol_cycle',
   'order_library',
   'order_type',
-  'require_ments',
-  'order_source',
-  'production_status',
-  'plan_type',
-  'delivery_status'
+   'quality_testing_code'
 ];

+ 164 - 0
src/views/inspectionStandard/components/edit.vue

@@ -0,0 +1,164 @@
+<!-- 用户编辑弹窗 -->
+<template>
+  <el-dialog class="ele-dialog-form" :title="title" :visible.sync="visible" :before-close="handleClose"
+    :close-on-click-modal="false" :close-on-press-escape="false" width="1000px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-row>
+
+       
+        <el-col :span="12">
+          <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="version">
+            <el-input v-model="form.version"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="状态:" prop="status">
+            <el-select v-model="form.status" placeholder="请选择" style="width: 100%">
+              <el-option label="停用" :value="0" />
+              <el-option label="启用" :value="1" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+        <el-form-item label="标准类型:" prop="type">
+            <DictSelection dictName="质检标准类型" v-model="form.type"></DictSelection>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+        <el-form-item label="标准代码:" prop="standardCode">
+          <el-input v-model="form.standardCode"></el-input>
+          </el-form-item>
+        </el-col>
+
+
+
+      </el-row>
+    </el-form>
+    <template v-slot:footer>
+      <el-button @click="handleClose">取消</el-button>
+      <el-button type="primary" :loading="loading" @click="save">
+        保存
+      </el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+
+import { save, update  } from '@/api/inspectionStandard';
+export default {
+
+  data() {
+    const defaultForm = function () {
+      return {
+        id: '',
+        name: '',
+        status: '',
+        type: '',
+        version: '',
+        standardCode: ''
+      };
+    };
+    return {
+      defaultForm,
+      // 表单数据
+      form: { ...defaultForm() },
+      // 表单验证规则
+      rules: {
+
+        name: [{ required: true, message: '请输入', trigger: 'blur' }],
+        version: [{ required: true, message: '请输入', trigger: 'blur' }],
+        type: {
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },
+
+        status: {
+          required: true,
+          message: '请选择',
+          trigger: 'change'
+        },
+
+      },
+      visible: false,
+      type: null,
+      title: null,
+      loading: false,
+
+    };
+  },
+
+  created() {
+
+  },
+  methods: {
+    open(type, row) {
+      this.title = type == 'add' ? '新增' : '编辑'
+      this.type = type;
+      if(this.type =='edit') {
+        this.form = row
+      }
+      this.visible = true;
+
+
+    },
+
+    /* 保存编辑 */
+    save() {
+      this.$refs.form.validate((valid) => {
+        if (!valid) {
+          return false;
+        }
+        this.loading = true;
+        if (this.type == 'add') {
+          delete this.form.id;
+        }
+        let URL = this.type == 'add' ? save : update
+        URL(this.form)
+          .then((msg) => {
+            this.loading = false;
+            this.$message.success(msg);
+            this.handleClose();
+            this.$emit('done');
+          })
+          .catch((e) => {
+            this.loading = false;
+          });
+      });
+    },
+    restForm() {
+      this.form = { ...this.defaultForm() };
+      this.$nextTick(() => {
+        this.$refs.form.clearValidate();
+      });
+    },
+    handleClose() {
+      this.restForm();
+      this.visible = false;
+    },
+
+
+  }
+};
+</script>
+<style lang="scss" scoped>
+.location-warp {
+  display: flex;
+
+  .detail {
+    margin-left: 10px;
+  }
+}
+
+:deep(.el-dialog:not(.ele-dialog-form) .el-dialog__body .el-form .el-form-item:last-child) {
+  margin-bottom: 22px;
+}
+</style>

+ 66 - 0
src/views/inspectionStandard/components/search.vue

@@ -0,0 +1,66 @@
+<!-- 搜索表单 -->
+<template>
+  <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-select v-model="where.status" class="m-2" placeholder="请选择" size="large">
+            <el-option label="停用" :value="0" />
+            <el-option label="启用" :value="1" />
+          </el-select>
+        </el-form-item>
+      </el-col>
+      <el-col v-bind="styleResponsive ? { lg: 6, md: 12 } : { span: 6 }">
+        <div class="ele-form-actions">
+          <el-button type="primary" icon="el-icon-search" class="ele-btn-icon" @click="search">
+            查询
+          </el-button>
+          <el-button @click="reset">重置</el-button>
+        </div>
+      </el-col>
+    </el-row>
+  </el-form>
+</template>
+
+<script>
+export default {
+  data() {
+    // 默认表单数据
+    const defaultWhere = {
+
+      name: '',
+      status: ''
+    };
+    return {
+      defaultWhere,
+      // 表单数据
+      where: { ...defaultWhere },
+
+    };
+  },
+  computed: {
+    // 是否开启响应式布局
+    styleResponsive() {
+      return this.$store.state.theme.styleResponsive;
+    }
+  },
+  methods: {
+    /* 搜索 */
+    search() {
+      this.$emit('search', this.where);
+    },
+    /*  重置 */
+    reset() {
+
+      this.where = { ...this.defaultWhere };
+      this.search();
+    }
+  }
+};
+</script>

+ 146 - 0
src/views/inspectionStandard/index.vue

@@ -0,0 +1,146 @@
+<template>
+    <div class="ele-body">
+        <el-card shadow="never">
+            <search ref="search" @search="search"></search>
+            <ele-pro-table ref="table" :columns="columns" :datasource="datasource" cache-key="systemRoleTable1">
+                <!-- 表头工具栏 -->
+                <template v-slot:toolbar>
+                    <el-button size="small" type="primary" icon="el-icon-plus" class="ele-btn-icon"
+                        @click="openEdit('add')">
+                        添加
+                    </el-button>
+                </template>
+
+                <template v-slot:status="{ row }">
+                    {{ row.status ? '启用' : "停用" }}
+                </template>
+
+                <template v-slot:type="{ row }">
+                    {{ row.type }}
+                </template>
+
+
+
+                <!-- 操作列 -->
+                <template v-slot:action="{ row }">
+                    <el-link type="primary" :underline="false" icon="el-icon-edit" @click="openEdit('edit', row)">
+                        修改
+                    </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>
+                        </template>
+                    </el-popconfirm>
+                </template>
+            </ele-pro-table>
+        </el-card>
+        <edit ref="edit" @done="done"></edit>
+    </div>
+</template>
+<script>
+import search from './components/search.vue';
+import edit from './components/edit.vue';
+import { getList, removeItem } from '@/api/inspectionStandard';
+
+export default {
+    components: {
+        search,
+        edit
+    },
+    data() {
+        return {
+            columns: [
+                {
+                    width: 45,
+                    type: 'index',
+                    columnKey: 'index',
+                    align: 'center'
+                },
+                {
+                    prop: 'code',
+                    label: '质检编码'
+                },
+                {
+                    label: '质检名称',
+                    prop: 'name'
+                },
+
+                {
+                    label: '状态',
+                    prop: 'status',
+                    slot: 'status'
+                },
+
+                {
+                    label: '版本号',
+                    prop: 'version',
+                },
+
+                {
+                    label: '标准类型',
+                    prop: 'type',
+                    slot: 'type'
+                },
+
+
+
+                {
+                    label: '标准代码',
+                    prop: 'standardCode',
+
+                },
+                {
+                    columnKey: 'action',
+                    label: '操作',
+                    width: 220,
+                    align: 'center',
+                    resizable: false,
+                    slot: 'action',
+                    showOverflowTooltip: true
+                }
+            ],
+
+
+
+        };
+    },
+    created() {
+
+    },
+    methods: {
+        datasource({ page, where, limit }) {
+            return getList({
+                ...where,
+                pageNum: page,
+                size: limit,
+
+            });
+        },
+        search(where) {
+            this.$refs.table.reload({
+                where: where,
+                page: 1
+            });
+        },
+        openEdit(type, row) {
+            this.$refs.edit.open(type, row);
+        },
+
+        remove(row) {
+            removeItem([row.id])
+                .then((message) => {
+                    this.$message.success(message);
+                    this.done();
+                })
+                .catch((e) => {
+                });
+        },
+        done() {
+            this.$refs.search.search();
+        }
+    }
+};
+</script>
+  

+ 0 - 0
src/views/inspectionWork/index.vue


+ 7 - 1
vue.config.js

@@ -33,7 +33,6 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         target: 'http://192.168.1.139:18086',
-
         changeOrigin: true, // 只有这个值为true的情况下 才表示开启跨域
         pathRewrite: {
           '^/api': ''
@@ -90,6 +89,13 @@ module.exports = {
   },
   css: {
     loaderOptions: {
+
+
+
+
+
+
+
       sass: {
         sassOptions: {
           outputStyle: 'expanded',