shebeihetong

hb_client/.env.development

@@ -2,8 +2,8 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
+VUE_APP_BASE_API = 'http://127.0.0.1:8000/api'
-VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
+#VUE_APP_BASE_API = 'http://47.95.0.242:2222/api'
 
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,

hb_client/src/api/equipment.js

@@ -34,3 +34,37 @@ export function deleteEquipment(id, data) {
     data
   })
 }
+export function getEquipmentrecordList(query) {
+  return request({
+    url: '/em/equipmentrecord/',
+    method: 'get',
+    params: query
+  })
+}
+export function getEquipmentrecordAll() {
+  return request({
+    url: '/em/equipmentrecord/',
+    method: 'get'
+  })
+}
+export function createEquipmentrecord(data) {
+  return request({
+    url: '/em/equipmentrecord/',
+    method: 'post',
+    data
+  })
+}
+export function updateEquipmentrecord(id, data) {
+  return request({
+    url: `/em/equipmentrecord/${id}/`,
+    method: 'put',
+    data
+  })
+}
+export function deleteEquipmentrecord(id, data) {
+  return request({
+    url: `/em/equipmentrecord/${id}/`,
+    method: 'delete',
+    data
+  })
+}

hb_client/src/router/index.js

@@ -143,9 +143,9 @@ export const asyncRoutes = [
         meta: { title: '监视和测量设备', icon: 'example', perms: ['index_manage'] }
       },
       {
-        path: 'equipment',
+        path: 'record',
-        name: 'equipment',
+        name: 'record',
-        component: () => import('@/views/em/equipment'),
+        component: () => import('@/views/em/record'),
         meta: { title: '校准检定记录', icon: 'example', perms: ['index_manage'] }
       },
       {
@@ -176,6 +176,28 @@ export const asyncRoutes = [
         meta: { title: '合同信息', icon: 'example', perms: ['index_manage'] }
       }
     ]
+  }
+  ,
+  {
+    path: '/sam',
+    component: Layout,
+    redirect: '/sam/customer',
+    name: 'sam',
+    meta: { title: '质量管理', icon: 'example', perms: ['equipment_set'] },
+    children: [
+      {
+        path: 'customer',
+        name: 'customer',
+        component: () => import('@/views/sam/customer'),
+        meta: { title: '标准', icon: 'example', perms: ['index_manage'] }
+      },
+      {
+        path: 'contract',
+        name: 'contract',
+        component: () => import('@/views/sam/contract'),
+        meta: { title: '检测项目', icon: 'example', perms: ['index_manage'] }
+      }
+    ]
   },
   {
     path: '/inm',

hb_client/src/views/em/detection.vue

@@ -73,7 +73,7 @@
          <el-table-column label="校/检状态">
           <template slot-scope="scope">{{  state_[scope.row.statedm] }}</template>
         </el-table-column>
-        state_
+    
         <el-table-column label="保管人">
           <template slot-scope="scope" v-if="scope.row.keeper_">{{ scope.row.keeper_.username }}</template>
         </el-table-column>

hb_client/src/views/em/record.vue

@@ -0,0 +1,336 @@
+<template>
+  <div class="app-container">
+    <el-card>
+      <div>
+      <el-input
+              v-model="listQuery.search"
+              placeholder="设备名称/设备编号/备注"
+              style="width: 300px"
+              class="filter-item"
+              @keyup.enter.native="handleFilter"
+            />
+            <el-button
+              class="filter-item"
+              type="primary"
+              icon="el-icon-search"
+              @click="handleFilter"
+              >搜索</el-button
+            >
+            <el-button
+              class="filter-item"
+              type="primary"
+              icon="el-icon-refresh-left"
+              @click="resetFilter"
+              >重置</el-button
+            >
+    </div>
+    <div style="margin-top: 10px">
+      <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >新增校准或检定</el-button
+      >
+    </div>
+    </el-card>
+    <el-card style="margin-top: 10px">
+      <el-table
+        v-loading="listLoading"
+        :data="equipmentrecordList.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+        max-height="600"
+      >
+       
+        <el-table-column type="index" width="50" />
+        <el-table-column label="设备名称">
+          <template slot-scope="scope">{{ scope.row.equipment_.name }}</template>
+        </el-table-column>
+         <el-table-column label="设备编号">
+          <template slot-scope="scope">{{ scope.row.equipment_.number }}</template>
+        </el-table-column>
+         <el-table-column label="型号规格">
+          <template slot-scope="scope">{{ scope.row.equipment_.model }}</template>
+        </el-table-column>
+         <el-table-column label="设备状态">
+          <template slot-scope="scope">{{ state_[scope.row.equipment_.statedm] }}</template>
+        </el-table-column>
+         <el-table-column label="最近一次校准/检定日期">
+          <template slot-scope="scope">{{ scope.row.recentlydate }}</template>
+        </el-table-column>
+         <el-table-column label="下次应校准或检定日期">
+          <template slot-scope="scope">{{ scope.row.nextdate }}</template>
+        </el-table-column>
+         <el-table-column label="备注">
+          <template slot-scope="scope">{{ scope.row.description }}</template>
+        </el-table-column>
+
+        <el-table-column
+          align="center"
+          label="操作"
+          width="120px"
+        >
+          <template slot-scope="scope">
+           
+            <el-link
+              v-if="checkPermission(['equipment_update'])"
+              @click="handleEdit(scope)"
+              >编辑</el-link
+            >
+            <el-link
+              v-if="checkPermission(['equipment_delete'])"
+              type="danger"
+              @click="handleDelete(scope)"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination
+        v-show="equipmentrecordList.count > 0"
+        :total="equipmentrecordList.count"
+        :page.sync="listQuery.page"
+        :limit.sync="listQuery.page_size"
+        @pagination="getList"
+      />
+    </el-card>
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dialogType === 'edit' ? '编辑校准检定' : '新增校准检定'"
+    >
+      <el-form
+        ref="Form"
+        :model="equipmentrecord"
+        label-width="120px"
+        label-position="right"
+        :rules="rule1"
+      >
+    
+        <el-form-item label="校准或检定设备" prop="equipment">
+          <el-select  style="width: 100%" v-model="equipmentrecord.equipment" placeholder="请选择">
+             <el-option
+                v-for="item in equipmentoptions"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+        </el-form-item>
+         <el-form-item label="校准或检定状态" prop="state">
+         
+           <el-select  style="width: 100%" v-model="equipmentrecord.state" placeholder="请选择">
+             <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+        </el-form-item>
+         <el-row>
+        <el-col :span="12">
+     <el-form-item label="最近一次校准或检定日期" prop="recentlydate">
+         <el-date-picker
+            v-model="equipmentrecord.recentlydate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          >
+          </el-date-picker>
+       
+         </el-form-item>
+          </el-col>
+         <el-col :span="12">
+           <el-form-item label="下次应校准或检定日期" prop="nextdate">
+         <el-date-picker
+            v-model="equipmentrecord.nextdate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          >
+          </el-date-picker>
+       
+         </el-form-item>
+          </el-col>
+         </el-row>
+       <el-form-item label="备注" prop="description">
+          <el-input
+            type="textarea"
+            :rows="4"
+            v-model="equipmentrecord.description"
+            placeholder="备注"
+          />
+        </el-form-item>
+
+         
+       
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="confirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getpEquipmentList, createEquipment,updateEquipment,deleteEquipment,
+getEquipmentrecordList, createEquipmentrecord,updateEquipmentrecord,deleteEquipmentrecord } from "@/api/equipment";
+import { getUserList } from "@/api/user";
+import { getOrgList } from "@/api/org";
+import checkPermission from "@/utils/permission";
+
+
+import { genTree } from "@/utils";
+import Pagination from "@/components/Pagination"; // secondary package based on el-pagination
+const defaultequipment = {
+};
+export default {
+  components: { Pagination },
+  data() {
+    return {
+      equipmentrecord: defaultequipment,
+      equipmentrecordList: {
+        count: 0,
+      },
+      
+      listQuery: {
+        page: 1,
+        page_size: 20,
+      },
+       state_:{
+          0:'合格',
+          1:'准用',
+          2:'限用',
+          3:'禁用',
+          4:'停用',
+          5:'封存',
+        },
+       options: [{
+          value: 0,
+          label: '合格'
+        }, {
+          value: 1,
+          label: '准用'
+        }, {
+          value: 2,
+          label: '限用'
+        },
+        {
+          value: 3,
+          label: '禁用'
+        }, {
+          value: 4,
+          label: '停用'
+        }, {
+          value: 5,
+          label: '封存'
+        }],
+      listLoading: true,
+      dialogVisible: false,
+      dialogType: "new",
+      rule1: {
+        equipment: [{ required: true, message: "请输入", trigger: "blur" }],
+        state: [{ required: true, message: "请输入", trigger: "blur" }],
+       
+      },
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.getequipmentList();
+      this.getList();
+  },
+  methods: {
+    checkPermission,
+    //设备
+    getequipmentList() {
+      getpEquipmentList({pageoff:true,type:2}).then((res) => {
+        this.equipmentoptions = genTree(res.data);
+      });
+    },
+      getList() {
+      this.listLoading = true;
+      getEquipmentrecordList(this.listQuery).then((response) => {
+        if (response.data) {
+          this.equipmentrecordList = response.data;
+        }
+        this.listLoading = false;
+      });
+    },
+
+    
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    resetFilter() {
+      this.listQuery = {
+        page: 1,
+        page_size: 20,
+      }
+      this.getList();
+    },
+    handleCreate() {
+      this.equipmentrecord = Object.assign({}, defaultequipment);
+      this.dialogType = "new";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+   
+    handleEdit(scope) {
+      this.equipmentrecord = Object.assign({}, scope.row); // copy obj
+      this.dialogType = "edit";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+    handleDelete(scope) {
+      this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleteEquipmentrecord(scope.row.id);
+          this.getList();
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+   
+    async confirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType === "edit";
+          if (isEdit) {
+            updateEquipmentrecord(this.equipmentrecord.id, this.equipmentrecord).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            createEquipmentrecord(this.equipmentrecord).then((res) => {
+              if (res.code >= 200) {
+                this.getList();
+                 this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+  },
+};
+</script>

hb_client/src/views/sam/contract.vue

@@ -33,7 +33,7 @@
     <el-card style="margin-top: 10px">
       <el-table
         v-loading="listLoading"
-        :data="warehouseList.results"
+        :data="contractList.results"
         border
         fit
         stripe
@@ -41,18 +41,21 @@
         max-height="600"
       >
         <el-table-column type="index" width="50" />
-        <el-table-column label="客户名称">
+        <el-table-column label="合同名称">
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
        
-        <el-table-column label="详细地址">
+        <el-table-column label="合同编号">
-          <template slot-scope="scope">{{ scope.row.address }}</template>
+          <template slot-scope="scope">{{ scope.row.number }}</template>
         </el-table-column>
-         <el-table-column label="联系人">
+         <el-table-column label="合同金额">
-          <template slot-scope="scope">{{ scope.row.contact }}</template>
+          <template slot-scope="scope">{{ scope.row.amount }}</template>
         </el-table-column>
-         <el-table-column label="联系电话">
+          <el-table-column label="客户名称">
-          <template slot-scope="scope">{{ scope.row.contact_phone }}</template>
+          <template slot-scope="scope">{{ scope.row.customer_.name }}</template>
+        </el-table-column>
+         <el-table-column label="签订日期">
+          <template slot-scope="scope">{{ scope.row.sign_date }}</template>
         </el-table-column>
        <el-table-column label="描述">
           <template slot-scope="scope">{{ scope.row.description }}</template>
@@ -82,8 +85,8 @@
         </el-table-column>
       </el-table>
       <pagination
-        v-show="warehouseList.count > 0"
+        v-show="contractList.count > 0"
-        :total="warehouseList.count"
+        :total="contractList.count"
         :page.sync="listQuery.page"
         :limit.sync="listQuery.page_size"
         @pagination="getList"
@@ -111,7 +114,24 @@
         </el-form-item>
 
          <el-form-item label="签订日期" prop="sign_date">
-          <el-input v-model="contract.sign_date" placeholder="签订日期" />
+           <el-date-picker
+            v-model="contract.sign_date"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            style="width: 100%"
+          >
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="客户" prop="sign_date">
+         <el-select  style="width: 100%" v-model="contract.customer" placeholder="请选择">
+             <el-option
+                v-for="item in options"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
           </el-form-item>
          <el-form-item label="描述" prop="description">
           <el-input v-model="contract.description" placeholder="描述" />
@@ -126,7 +146,7 @@
   </div>
 </template>
 <script>
-import { getContractList, createContract,updateContract,deleteContract } from "@/api/sam";
+import { getContractList, createContract,updateContract,deleteContract,getCustomerList } from "@/api/sam";
 import checkPermission from "@/utils/permission";
 
 
@@ -139,14 +159,14 @@ export default {
   data() {
     return {
       contract: defaultecontract,
-     customerList: {
+     contractList: {
         count: 0,
       },
       listQuery: {
         page: 1,
         page_size: 20,
       },
-     
+     options:[],
       listLoading: true,
       dialogVisible: false,
       dialogType: "new",
@@ -158,21 +178,30 @@ export default {
   computed: {},
   watch: {},
   created() {
+     this.getLists();
     this.getList();
   },
   methods: {
     checkPermission,
-    //设备列表
+  
     getList() {
       this.listLoading = true;
       getContractList(this.listQuery).then((response) => {
         if (response.data) {
-          this.warehouseList = response.data;
+          this.contractList = response.data;
         }
         this.listLoading = false;
       });
     },
    
+     getLists() {
+      
+      getCustomerList({pageoff:true}).then((response) => {
+        
+          this.options = genTree(response.data);
+       
+      });
+    },
    
     handleFilter() {
       this.listQuery.page = 1;

hb_server/apps/em/migrations/0007_equipmentrecord.py

@@ -0,0 +1,37 @@
+# Generated by Django 3.2.6 on 2021-09-15 01:49
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('system', '0003_auto_20210812_0909'),
+        ('em', '0006_auto_20210914_1335'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Equipmentrecord',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')),
+                ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')),
+                ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')),
+                ('recentlydate', models.DateField(blank=True, null=True, verbose_name='最近一次校准/检定日期')),
+                ('nextdate', models.DateField(blank=True, null=True, verbose_name='下次应校准或检定日期')),
+                ('description', models.CharField(blank=True, max_length=200, null=True, verbose_name='描述')),
+                ('belong_dept', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='equipmentrecord_belong_dept', to='system.organization', verbose_name='所属部门')),
+                ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='equipmentrecord_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
+                ('equipment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='em.equipment', verbose_name='校准检定设备')),
+                ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='equipmentrecord_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

hb_server/apps/em/models.py

@@ -75,3 +75,8 @@ class Equipment(CommonBModel):
     def __str__(self):
         return self.number + '-' + self.name
     
+class Equipmentrecord(CommonBModel):
+    equipment = models.ForeignKey(Equipment, verbose_name='校准检定设备', on_delete=models.CASCADE, null=True, blank=True)
+    recentlydate = models.DateField('最近一次校准/检定日期',blank=True, null=True)
+    nextdate = models.DateField('下次应校准或检定日期',blank=True, null=True)
+    description = models.CharField('描述', max_length=200, blank=True, null=True)

hb_server/apps/em/serializers.py

@@ -1,6 +1,6 @@
 from rest_framework.serializers import ModelSerializer
 
-from .models import Equipment
+from .models import Equipment,Equipmentrecord
 from apps.system.serializers import OrganizationSimpleSerializer, UserSimpleSerializer
 
 
@@ -21,3 +21,17 @@ class EquipmentSimpleSerializer(ModelSerializer):
     class Meta:
         model = Equipment
         fields = ['id', 'number', 'name']
+
+
+
+class EquipmentrecordSerializer(ModelSerializer):
+    equipment_ = EquipmentSerializer(source='equipment', read_only=True)
+    class Meta:
+        model = Equipmentrecord
+        fields = '__all__'
+
+    @staticmethod
+    def setup_eager_loading(queryset):
+        """ Perform necessary eager loading of data. """
+        queryset = queryset.select_related('equipment')
+        return queryset

hb_server/apps/em/urls.py

@@ -1,11 +1,12 @@
 from django.db.models import base
 from rest_framework import urlpatterns
-from apps.em.views import EquipmentViewSet
+from apps.em.views import EquipmentViewSet,EquipmentrecordViewSet
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
 router = DefaultRouter()
 router.register('equipment', EquipmentViewSet, basename='equipment')
+router.register('equipmentrecord', EquipmentrecordViewSet, basename='equipmentrecord')
 urlpatterns = [
     path('', include(router.urls)),
 ]

hb_server/apps/em/views.py

@@ -1,8 +1,10 @@
 from django.shortcuts import render
 from rest_framework.viewsets import ModelViewSet
 
-from apps.em.models import Equipment
+from rest_framework import serializers, status
-from apps.em.serializers import EquipmentSerializer
+from rest_framework.response import Response
+from apps.em.models import Equipment,Equipmentrecord
+from apps.em.serializers import EquipmentSerializer,EquipmentrecordSerializer
 from apps.system.mixins import CreateUpdateModelAMixin, OptimizationMixin
 
 
@@ -19,3 +21,40 @@ class EquipmentViewSet(CreateUpdateModelAMixin, OptimizationMixin, ModelViewSet)
     filterset_fields = ['belong_dept', 'keeper', 'type']
     ordering_fields = ['create_time']
     ordering = ['-create_time']
+
+
+# Create your views here.
+class EquipmentrecordViewSet(CreateUpdateModelAMixin, OptimizationMixin, ModelViewSet):
+    """
+    设备台账-增删改查
+    """
+    perms_map = {'get': '*', 'post': 'equipmentrecord_create',
+                 'put': 'equipmentrecord_update', 'delete': 'equipmentrecord_delete'}
+    queryset = Equipmentrecord.objects.all()
+    serializer_class = EquipmentrecordSerializer
+    filterset_fields = ['equipment']
+    ordering_fields = ['create_time']
+    ordering = ['-create_time']
+   
+    def create(self, request, *args, **kwargs):
+       
+        data = request.data
+        if data.get('equipment', None):
+            equipment = Equipment.objects.get(pk=data['equipment'])
+            equipment.statedm = data['state']
+            equipment.save()
+        serializer = self.get_serializer(data=request.data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return Response(status=status.HTTP_200_OK)
+    def update(self, request, *args, **kwargs):
+        data = request.data
+        if data.get('equipment', None):
+            equipment = Equipment.objects.get(pk=data['equipment'])
+            equipment.statedm = data['state']
+            equipment.save()
+        id = self.get_object()
+        serializer = self.get_serializer(id, data=data)
+        serializer.is_valid(raise_exception=True)
+        serializer.save()
+        return Response(status=status.HTTP_200_OK)

hb_server/apps/mtm/serializers.py

@@ -50,7 +50,7 @@ class StepSimpleSerializer(serializers.ModelSerializer):
         fields = ['id', 'name', 'sort']
 
 class StepDetailSerializer(serializers.ModelSerializer):
-  
+    equipments_ = EquipmentSimpleSerializer(source='equipments', many=True)
     class Meta:
         model = Step
         fields = '__all__'

hb_server/apps/sam/serializers.py

@@ -14,10 +14,11 @@ class CustomerCreateUpdateSerializer(serializers.ModelSerializer):
 
 class CustomerSimpleSerializer(serializers.ModelSerializer):
     class Meta:
+        model = Customer
         fields = ['id', 'name']
 
 class ContractSerializer(serializers.ModelSerializer):
-
+    customer_  = CustomerSimpleSerializer(source='customer', read_only=True)
     class Meta:
         model = Contract
         fields = '__all__'