666

src/api/inspectionProject/index.js

@@ -30,6 +30,16 @@ export async function update(data) {
 }
 
 
+// 获取详情
+export async function getById(id) {
+  const res = await request.get(`/qms/qms/inspection_item//getById/${id}`);
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+
+
 
 
 

src/enum/dict.js

@@ -12,6 +12,7 @@ export default {
   质检类型:'inspection_type',
   不良品处理类型:'unqualified_products_type',
   质检计划类型:'inspection_plan_type',
+  工艺参数单位: 'parameter_code',
 
 
 };

src/views/inspectionProject/components/user-edit.vue

@@ -12,24 +12,28 @@
     <header-title title="基本信息"></header-title>
     <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-row>
-        <el-col :span="10">
-          <el-form-item label="参数编码:" prop="code">
+        <el-col :span="12">
+          <el-form-item label="参数编码:" prop="inspectionCode">
             <el-input
               clearable
               disabled
-              v-model="form.code"
+              v-model="form.inspectionCode"
               placeholder="请输入"
             />
           </el-form-item>
         </el-col>
 
-        <el-col :span="10">
-          <el-form-item label="参数名称:" prop="name">
-            <el-input v-model="form.name" clearable placeholder="请输入" />
+        <el-col :span="12">
+          <el-form-item label="参数名称:" prop="inspectionName">
+            <el-input
+              v-model="form.inspectionName"
+              clearable
+              placeholder="请输入"
+            />
           </el-form-item>
         </el-col>
 
-        <el-col :span="10">
+        <el-col :span="12">
           <el-form-item label="参数类型:" prop="textType">
             <el-select
               v-model="form.textType"
@@ -38,7 +42,7 @@
             >
               <el-option label="数值" :value="'1'" />
               <el-option label="选择" :value="'2'" />
-              <el-option label="产品参数" :value="'3'" />
+              <el-option label="上下限" :value="'3'" />
               <el-option label="规格" :value="'4'" />
               <el-option label="时间" :value="'5'" />
               <el-option label="范围" :value="'6'" />
@@ -47,7 +51,7 @@
         </el-col>
 
         <el-col
-          :span="10"
+          :span="12"
           v-if="
             form.textType == 1 ||
             form.textType == 3 ||
@@ -56,7 +60,6 @@
           "
         >
           <el-form-item label="默认值:">
-            <!-- oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value" -->
             <el-input
               v-model="form.defaultValue"
               placeholder="请输入"
@@ -64,9 +67,7 @@
           </el-form-item>
         </el-col>
 
-
-
-        <el-col :span="10" v-if="form.textType == 2">
+        <el-col :span="12" v-if="form.textType == 2">
           <el-form-item label="默认值:" prop="defaultValue">
             <el-select
               v-model="form.defaultValue"
@@ -79,39 +80,27 @@
           </el-form-item>
         </el-col>
 
-        <el-col
-          :span="10"
-          v-if="
-            form.textType == 6
-          "
-        >
+        <el-col :span="12" v-if="form.textType == 6">
           <el-form-item label="默认值:">
-            <!-- oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value" -->
             <el-input
               v-model="form.defaultValue"
-                 placeholder="案例： 12.7≤IC<19.05 ；IC<12.7"
+              placeholder="案例： 12.7≤IC<19.05 ；IC<12.7"
             ></el-input>
           </el-form-item>
         </el-col>
 
-        <el-col :span="10" v-if="form.textType == 3">
+        <el-col :span="12" v-if="form.textType == 3">
           <el-form-item label="参数上限:">
             <el-input placeholder="请输入" v-model="form.maxValue" />
-            <!-- <el-input
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value"
-              v-model="form.maxValue" placeholder="请输入"></el-input> -->
           </el-form-item>
         </el-col>
-        <el-col :span="10" v-if="form.textType == 3">
+        <el-col :span="12" v-if="form.textType == 3">
           <el-form-item label="参数下限:">
             <el-input placeholder="请输入" v-model="form.minValue" />
-            <!-- <el-input
-              oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d\d\d\d\d\d\d).*$/, '$1$2.$3').replace(/^\./g, '').replace(/^0+(?!\.|$)/g, ''),value = Number(value) >= 999999.99 ? 999999.99 : value"
-              v-model="form.minValue" placeholder="请输入"></el-input> -->
           </el-form-item>
         </el-col>
 
-        <el-col :span="10" v-if="form.textType != 2 && form.textType != 5">
+        <el-col :span="12" v-if="form.textType != 2 && form.textType != 5">
           <el-form-item label="参数单位:" prop="unitName">
             <DictSelection
               dictName="工艺参数单位"
@@ -123,23 +112,56 @@
           </el-form-item>
         </el-col>
 
-        <el-col :span="10" v-if="form.textType == 5">
+        <el-col :span="12" v-if="form.textType == 5">
           <el-form-item label="参数单位:" prop="unitName">
             h(小时)
           </el-form-item>
         </el-col>
 
-        <el-col :span="20">
-          <el-form-item label="文字描述:">
-            <el-input placeholder="请输入" v-model="form.description" />
+        <el-col :span="12">
+          <el-form-item label="工艺要求:" prop="inspectionStandard">
+            <el-input v-model="form.inspectionStandard">
+              <DictSelection
+                style="width: 100px"
+                slot="prepend"
+                clearable
+                dictName="数学字符"
+                v-model="form.symbol"
+              ></DictSelection>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="单位:" prop="unit">
+            <DictSelection
+              clearable
+              dictName="质检项标准单位"
+              v-model="form.unit"
+            ></DictSelection>
           </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="20">
+          <el-form-item label="备注:">
+            <el-input placeholder="请输入" v-model="form.inspectionRemark" />
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 
-
     <template v-slot:footer>
       <el-button @click="updateVisible(false)">取消</el-button>
       <el-button type="primary" :loading="loading" @click="save">
@@ -150,8 +172,6 @@
 </template>
 
 <script>
-
-  
   import { save, update, getById } from '@/api/inspectionProject';
 
   export default {
@@ -164,18 +184,21 @@
     data() {
       const defaultForm = {
         id: null,
-        code: '',
-        name: '',
+        inspectionCode: '',
+        inspectionName: '',
         textType: '1',
-      
+
         defaultValue: '',
-        description: '',
+
         maxValue: '',
         minValue: '',
         unitName: '',
 
-
-        intervalList: []
+ 
+        inspectionStandard: '',
+        unit: '',
+        symbol: '',
+        inspectionRemark: '',
       };
       return {
         defaultForm,
@@ -187,7 +210,7 @@
         ],
         statusList: [
           { label: '工艺', value: 0 },
-          { label: '工序', value: 1 },
+          { label: '质检', value: 1 },
           { label: '产品', value: 2 },
           { label: '原料', value: 3 },
           { label: '设备', value: 4 },
@@ -201,10 +224,10 @@
         // 表单验证规则
         rules: {
           name: [
-            { required: true, message: '请输入工序名称', trigger: 'blur' }
+            { required: true, message: '请输入质检名称', trigger: 'blur' }
           ],
-          code: [
-            { required: true, message: '请输入工序编码', trigger: 'blur' }
+          inspectionCode: [
+            { required: true, message: '请输入质检编码', trigger: 'blur' }
           ],
 
           unitName: [
@@ -213,7 +236,14 @@
           textType: [
             { required: true, message: '请选择参数类型', trigger: 'blur' }
           ],
-  
+
+          inspectionStandard: [
+            {
+              required: true,
+              message: '请输入',
+              trigger: 'blur'
+            }
+          ]
         },
 
         tableFormRules: {
@@ -237,67 +267,55 @@
       }
     },
     methods: {
-      addInterval() {
-        this.form.intervalList.push({ name: '', formula: '' });
-      },
-
-      delInterval(index) {
-        this.form.intervalList.splice(index, 1);
-      },
-
       /* 保存编辑 */
       save() {
         this.$refs.form.validate((valid) => {
-            if (!valid) {
-              return false;
-            }
-            this.loading = true;
-            if (!this.isUpdate) {
-              delete this.form.id;
-            }
-            const saveOrUpdate = this.isUpdate
-              ? update
-              :save;
+          if (!valid) {
+            return false;
+          }
+          this.loading = true;
+          if (!this.isUpdate) {
+            delete this.form.id;
+          }
+          const saveOrUpdate = this.isUpdate ? update : save;
 
-            const defaultValue = Number(this.form.defaultValue);
-            const maxValue = Number(this.form.maxValue);
-            const minValue = Number(this.form.minValue);
-            if ((defaultValue != '') & (maxValue != '')) {
-              if (defaultValue > maxValue || defaultValue == maxValue) {
-                this.loading = false;
-                return this.$message.warning('默认值应小于参数上限');
-              }
-            }
-            if ((defaultValue != '') & (minValue != '')) {
-              if (defaultValue < minValue || defaultValue == minValue) {
-                this.loading = false;
-                return this.$message.warning('默认值应大于参数下限');
-              }
+          const defaultValue = Number(this.form.defaultValue);
+          const maxValue = Number(this.form.maxValue);
+          const minValue = Number(this.form.minValue);
+          if ((defaultValue != '') & (maxValue != '')) {
+            if (defaultValue > maxValue || defaultValue == maxValue) {
+              this.loading = false;
+              return this.$message.warning('默认值应小于参数上限');
             }
-            if ((maxValue != '') & (minValue != '')) {
-              if (maxValue < minValue || maxValue == minValue) {
-                this.loading = false;
-                return this.$message.warning('参数上限应大于参数下限');
-              }
+          }
+          if ((defaultValue != '') & (minValue != '')) {
+            if (defaultValue < minValue || defaultValue == minValue) {
+              this.loading = false;
+              return this.$message.warning('默认值应大于参数下限');
             }
-            if (this.form.textType == 5) {
-              this.form.unitName = 'h';
+          }
+          if ((maxValue != '') & (minValue != '')) {
+            if (maxValue < minValue || maxValue == minValue) {
+              this.loading = false;
+              return this.$message.warning('参数上限应大于参数下限');
             }
-            saveOrUpdate(this.form)
-              .then((msg) => {
-                this.loading = false;
-                this.form = {};
-                const info = this.isUpdate ? '修改成功' : '新增成功';
-                this.$message.success(info);
-                this.updateVisible(false);
-                this.$emit('done');
-              })
-              .catch((e) => {
-                this.loading = false;
-                // this.$message.error(e.message);
-              });
-          });
-  
+          }
+          if (this.form.textType == 5) {
+            this.form.unitName = 'h';
+          }
+          saveOrUpdate(this.form)
+            .then((msg) => {
+              this.loading = false;
+              this.form = {};
+              const info = this.isUpdate ? '修改成功' : '新增成功';
+              this.$message.success(info);
+              this.updateVisible(false);
+              this.$emit('done');
+            })
+            .catch((e) => {
+              this.loading = false;
+            });
+        });
       },
       /* 更新visible */
       updateVisible(value) {
@@ -310,22 +328,20 @@
         if (visible) {
           if (this.data) {
             const res = await getById(this.data.id);
+            console.log(666, res);
 
             this.$util.assignObject(this.form, {
               ...res
             });
             this.isUpdate = true;
           } else {
-            // const res = await parameter.getCode();
-            this.form.code = res;
             this.isUpdate = false;
           }
         } else {
           this.$refs.form.clearValidate();
           this.$refs.form1.clearValidate();
-          
+
           this.form = { ...this.defaultForm };
-         this.$set(this.form, 'intervalList', [])
         }
       }
     }

src/views/inspectionProject/components/user-search.vue

@@ -26,23 +26,7 @@
           />
         </el-form-item>
       </el-col>
-      <el-col v-bind="styleResponsive ? { lg: 5, md: 12 } : { span: 4 }">
-        <el-form-item label="参数分类:">
-          <el-select
-            v-model.trim="where.categoryType"
-            filterable
-            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: 4, md: 12 } : { span: 4 }">
         <div class="ele-form-actions">
@@ -74,14 +58,7 @@
       return {
         // 表单数据
         where: { ...defaultWhere },
-        statusList: [
-          { label: '工艺', value: 0 },
-          { label: '工序', value: 1 },
-          { label: '产品', value: 2 },
-          { label: '原料', value: 3 },
-          { label: '设备', value: 4 },
-          { label: '其他', value: 5 }
-        ]
+   
       };
     },
     computed: {

src/views/inspectionProject/index.vue

@@ -33,10 +33,7 @@
           >
         </template>
 
-        <template v-slot:status="{ row }">
-          <!-- {{ checkType(row.categoryType) }} -->
-        </template>
-        <!-- 状态列 -->
+        <template v-slot:status="{ row }"> </template>
 
         <template v-slot:textType="{ row }">
           {{
@@ -45,7 +42,7 @@
               : row.textType == 2
               ? '选择'
               : row.textType == 3
-              ? '产品参数'
+              ? '上下限'
               : row.textType == 4
               ? '规格'
               : row.textType == 5
@@ -69,7 +66,7 @@
 
           <el-popconfirm
             class="ele-action"
-            title="确定要删除当前工序吗？"
+            title="确定要删除当前质检吗？"
             @confirm="remove(row)"
           >
             <template v-slot:reference>
@@ -90,11 +87,11 @@
     />
     <!-- 导入弹窗 -->
 
-
     <importDialog
       :defModule="moudleName"
       ref="importDialogRef"
-      @success="reload"></importDialog>
+      @success="reload"
+    ></importDialog>
   </div>
 </template>
 
@@ -117,15 +114,14 @@
         // 表格列配置
         columns: [
           {
-            prop: 'code',
+            prop: 'inspectionCode',
             label: '参数编码',
-            // sortable: 'custom',
             showOverflowTooltip: true,
             align: 'center',
             minWidth: 110
           },
           {
-            prop: 'name',
+            prop: 'inspectionName',
             label: '参数名称',
             showOverflowTooltip: true,
             align: 'center',
@@ -140,13 +136,7 @@
             slot: 'textType',
             minWidth: 110
           },
-          {
-            align: 'center',
-            prop: 'description',
-            label: '文本描述',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+
           {
             prop: 'maxValue',
             label: '参数上限',
@@ -166,11 +156,25 @@
             showOverflowTooltip: true
           },
           {
-            prop: 'categoryType',
-            label: '参数分类',
-            align: 'center',
-            slot: 'status',
-            showOverflowTooltip: true
+            label: '工艺要求',
+            prop: 'inspectionStandard',
+            formatter: (row, column, cellValue) => {
+              return row.symbol + ' ' + cellValue + ' ' + row.unit;
+            },
+            minWidth: 150
+          },
+
+          {
+            label: '状态',
+            prop: 'status',
+            formatter: (row, column, cellValue) => {
+              return cellValue == 1 ? '启用' : cellValue === 0 ? '停用' : '';
+            }
+          },
+
+          {
+            label: '备注',
+            prop: 'inspectionRemark'
           },
 
           {
@@ -183,14 +187,7 @@
             showOverflowTooltip: true
           }
         ],
-        statusList: [
-          { label: '工艺', value: 0 },
-          { label: '工序', value: 1 },
-          { label: '产品', value: 2 },
-          { label: '原料', value: 3 },
-          { label: '设备', value: 4 },
-          { label: '其他', value: 5 }
-        ],
+
         // 表格选中数据
         selection: [],
         // 当前编辑数据
@@ -198,15 +195,13 @@
         // 是否显示编辑弹窗
         showEdit: false,
         // 是否显示导入弹窗
-        showImport: false
+        showImport: false,
+        moudleName: ''
       };
     },
     methods: {
       /*回显类型 */
-      checkType(id) {
-        const obj = this.statusList.find((item) => item.value == id);
-        return obj.label;
-      },
+
       /* 表格数据源 */
       datasource({ page, where, limit }) {
         return getList({
@@ -244,7 +239,6 @@
           })
           .catch((e) => {
             loading.close();
-            // this.$message.error(e.message);
           });
       },
       /* 批量删除 */
@@ -253,7 +247,7 @@
           this.$message.error('请至少选择一条数据');
           return;
         }
-        this.$confirm('确定要删除选中的工序吗?', '提示', {
+        this.$confirm('确定要删除选中的质检吗?', '提示', {
           type: 'warning'
         })
           .then(() => {
@@ -266,7 +260,6 @@
               })
               .catch((e) => {
                 loading.close();
-                // this.$message.error(e.message);
               });
           })
           .catch(() => {});