diff --git a/hb_client/src/components/customForm/index.vue b/hb_client/src/components/customForm/index.vue index 96558e8..b108647 100644 --- a/hb_client/src/components/customForm/index.vue +++ b/hb_client/src/components/customForm/index.vue @@ -132,7 +132,6 @@
-
@@ -200,6 +199,8 @@ } }, mounted() { + debugger; + debugger; let that = this; that.checkForm = {}; this.form = this.formID; @@ -232,17 +233,20 @@ let listJudge = this.formData.filter(item => { return item.need_judge === true; }); + debugger; listJudge.forEach(item => { let obj = new Object(); obj = item; that.judgeList.push(obj) }); + debugger; let imag= this.formData.filter(item => { return item.field_type === 'draw'; }); that.img = new Image(); - that.img.crossOrigin = ''; - that.img = 'http://47.95.0.242:2222'+imag[0].draw_template; + that.img.crossOrigin = 'anonymous'; + let value = imag[0].field_value?imag[0].field_value:imag[0].draw_template; + that.img = 'http://47.95.0.242:2222'+value; setTimeout(function(){ that.canvasInit(); },500); diff --git a/hb_client/src/views/mtm/materialdo.vue b/hb_client/src/views/mtm/materialdo.vue index fed046b..19b98e6 100644 --- a/hb_client/src/views/mtm/materialdo.vue +++ b/hb_client/src/views/mtm/materialdo.vue @@ -97,6 +97,7 @@ :results="fieldList.results" :hasPicture="hasPicture" :formID="formID" + :isDisabled="isDisabled" @formFunc="formFunc" /> - + + +
+ {{item.field_name}}： + {{item.field_value}} +
+ + +
+ {{item.field_name}}： + +
+ +
+ diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue index bfb4ae5..5c58541 100644 --- a/hb_client/src/views/wpm/need.vue +++ b/hb_client/src/views/wpm/need.vue @@ -938,12 +938,11 @@ //批量入库 putins() { let _this = this; - _this.mutipID = [] + _this.mutipID = []; this.$refs.multipleTable.selection.forEach((item) => { _this.mutipID.push(item.id); }); - console.log(_this.mutipID); createputins({ warehouse: this.form.warehouse, wproducts: _this.mutipID, @@ -1185,6 +1184,7 @@ that.formName = res.data.form_.name; let fieldList = res.data.record_data; that.fieldList = [...fieldList]; + debugger; let arr = fieldList.filter(item => { return item.field_type === 'draw' }); diff --git a/hb_server/apps/hrm/models.py b/hb_server/apps/hrm/models.py index 47d1dc2..dc85cf5 100644 --- a/hb_server/apps/hrm/models.py +++ b/hb_server/apps/hrm/models.py @@ -3,7 +3,7 @@ from django.contrib.auth.models import AbstractUser from django.db.models.base import Model import django.utils.timezone as timezone from django.db.models.query import QuerySet -from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File,Position +from apps.system.models import CommonADModel, CommonAModel, CommonBModel, Organization, User, Dict, File,Position from utils.model import SoftModel, BaseModel from simple_history.models import HistoricalRecords @@ -36,3 +36,8 @@ class Employee(CommonAModel): def __str__(self): return self.name +class Attendance(CommonADModel): + """ + 出勤记录 + """ + \ No newline at end of file diff --git a/hb_server/apps/inm/serializers.py b/hb_server/apps/inm/serializers.py index 34d26f4..e983108 100644 --- a/hb_server/apps/inm/serializers.py +++ b/hb_server/apps/inm/serializers.py @@ -4,7 +4,7 @@ from rest_framework import serializers from apps.inm.models import FIFO, FIFOItem, FIFOItemProduct, IProduct, MaterialBatch, WareHouse, Inventory from apps.qm.models import TestRecord, TestRecordItem -from apps.system.serializers import UserSimpleSerializer +from apps.system.serializers import FileSimpleSerializer, UserSimpleSerializer from apps.mtm.serializers import MaterialSimpleSerializer from django.db import transaction @@ -71,7 +71,7 @@ class FIFOListSerializer(serializers.ModelSerializer): class FIFOItemSerializer(serializers.ModelSerializer): warehouse_ = WareHouseSimpleSerializer(source='warehouse', read_only=True) material_ = MaterialSimpleSerializer(source='material', read_only=True) - + files_ = FileSimpleSerializer(source='files', many=True, read_only=True) class Meta: model = FIFOItem fields = '__all__' diff --git a/hb_server/apps/inm/tests.py b/hb_server/apps/inm/tests.py index 7ce503c..e9bda07 100644 --- a/hb_server/apps/inm/tests.py +++ b/hb_server/apps/inm/tests.py @@ -1,3 +1,10 @@ +from django.urls import reverse from django.test import TestCase - +from rest_framework.test import APITestCase +from rest_framework import status # Create your tests here. +class WareHouseTests(APITestCase): + def test_list_warehouse(self): + url = reverse('warehouse-list') + resp = self.client.get(url) + self.assertEqual(resp.status_code, status.HTTP_200_OK) \ No newline at end of file diff --git a/hb_server/apps/inm/views.py b/hb_server/apps/inm/views.py index 932a1d1..a0d9fb5 100644 --- a/hb_server/apps/inm/views.py +++ b/hb_server/apps/inm/views.py @@ -82,7 +82,7 @@ class FIFOItemViewSet(ListModelMixin, DestroyModelMixin, UpdateModelMixin, Gener 出入库记录详情表 """ perms_map = {'*': '*'} - queryset = FIFOItem.objects.select_related('material', 'fifo').all() + queryset = FIFOItem.objects.select_related('material', 'fifo').prefetch_related('files').all() serializer_class = FIFOItemSerializer filterset_fields = ['material', 'fifo', 'fifo__type', 'need_test', 'is_testok'] diff --git a/hb_server/apps/qm/serializers.py b/hb_server/apps/qm/serializers.py index b0d8054..561bf2b 100644 --- a/hb_server/apps/qm/serializers.py +++ b/hb_server/apps/qm/serializers.py @@ -59,6 +59,7 @@ class TestRecordItemSerializer(serializers.ModelSerializer): parent = serializers.PrimaryKeyRelatedField(source='form_field.parent', read_only=True) help_text = serializers.CharField(source='form_field.help_text', read_only=True) sort = serializers.IntegerField(source='form_field.sort', read_only=True) + draw_template = serializers.CharField(source='form_field.draw_template', read_only=True) class Meta: model = TestRecordItem fields = '__all__' diff --git a/hb_server/server/settings.py b/hb_server/server/settings.py index 7c3dc19..cc780f3 100644 --- a/hb_server/server/settings.py +++ b/hb_server/server/settings.py @@ -173,6 +173,7 @@ REST_FRAMEWORK = { 'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.coreapi.AutoSchema', 'UNAUTHENTICATED_USER': None, 'UNAUTHENTICATED_TOKEN': None, + 'TEST_REQUEST_DEFAULT_FORMAT': 'json' } # simplejwt配置 SIMPLE_JWT = {