From 4ff3a46c59b6f8dcd7bec0e89b0850981205f298 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Wed, 29 Sep 2021 08:46:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5em=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inm/migrations/0004_auto_20210929_0842.py | 45 +++++++++++++++++++ hb_server/apps/inm/models.py | 11 ++--- .../0010_alter_ticketflow_transition.py | 19 ++++++++ 3 files changed, 70 insertions(+), 5 deletions(-) create mode 100644 hb_server/apps/inm/migrations/0004_auto_20210929_0842.py create mode 100644 hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py diff --git a/hb_server/apps/inm/migrations/0004_auto_20210929_0842.py b/hb_server/apps/inm/migrations/0004_auto_20210929_0842.py new file mode 100644 index 0000000..aefebcb --- /dev/null +++ b/hb_server/apps/inm/migrations/0004_auto_20210929_0842.py @@ -0,0 +1,45 @@ +# Generated by Django 3.2.6 on 2021-09-29 00:42 + +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + ('mtm', '0018_material_count'), + ('inm', '0003_auto_20210928_1702'), + ] + + operations = [ + migrations.CreateModel( + name='MaterialBatch', + 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='删除标记')), + ('count', models.IntegerField(default=0, verbose_name='存量')), + ('batch', models.CharField(blank=True, max_length=100, null=True, verbose_name='批次号')), + ('expiration_date', models.DateField(blank=True, null=True, verbose_name='有效期')), + ('material', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='mtm.material', verbose_name='物料信息')), + ('warehouse', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='inm.warehouse', verbose_name='所在仓库')), + ], + options={ + 'verbose_name': '库存表', + 'verbose_name_plural': '库存表', + }, + ), + migrations.RemoveField( + model_name='inventory', + name='create_by', + ), + migrations.RemoveField( + model_name='inventory', + name='update_by', + ), + migrations.DeleteModel( + name='Materials', + ), + ] diff --git a/hb_server/apps/inm/models.py b/hb_server/apps/inm/models.py index 9a320d1..52a7ddc 100644 --- a/hb_server/apps/inm/models.py +++ b/hb_server/apps/inm/models.py @@ -23,7 +23,7 @@ class WareHouse(CommonAModel): def __str__(self): return self.name -class Inventory(CommonAModel): +class Inventory(BaseModel): """ 库存物料 """ @@ -34,14 +34,15 @@ class Inventory(CommonAModel): verbose_name = '库存表' verbose_name_plural = verbose_name -class Materials(CommonAModel): +class MaterialBatch(BaseModel): """ 物料批次 """ - inventory = models.ForeignKey(Inventory, on_delete=models.CASCADE, verbose_name='仓库物料') + material = models.ForeignKey(Material, on_delete=models.CASCADE, verbose_name='物料信息') + warehouse = models.ForeignKey(WareHouse, on_delete=models.CASCADE, verbose_name='所在仓库') count = models.IntegerField('存量', default=0) - batch = models.CharField('批次', max_length=100, null=True, blank=True) - effective = models.DateField('有效期', null=True, blank=True) + batch = models.CharField('批次号', max_length=100, null=True, blank=True) + expiration_date = models.DateField('有效期', null=True, blank=True) class Meta: verbose_name = '库存表' verbose_name_plural = verbose_name diff --git a/hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py b/hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py new file mode 100644 index 0000000..82a9ce8 --- /dev/null +++ b/hb_server/apps/wf/migrations/0010_alter_ticketflow_transition.py @@ -0,0 +1,19 @@ +# Generated by Django 3.2.6 on 2021-09-29 00:42 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('wf', '0009_ticketflow_participant_type'), + ] + + operations = [ + migrations.AlterField( + model_name='ticketflow', + name='transition', + field=models.ForeignKey(blank=True, help_text='与worklow.Transition关联， 为0时表示认为干预的操作', null=True, on_delete=django.db.models.deletion.CASCADE, to='wf.transition', verbose_name='流转id'), + ), + ] From e921634fee36412fedc742dddd662af48aca29c0 Mon Sep 17 00:00:00 2001 From: shijing Date: Wed, 29 Sep 2021 09:39:46 +0800 Subject: [PATCH 2/2] transitions --- hb_client/src/api/workflow.js | 8 + hb_client/src/views/mtm/process.vue | 3 +- hb_client/src/views/testModel/faceLogin.vue | 21 +- hb_client/src/views/workflow/index.vue | 8 +- hb_client/src/views/workflow/state.vue | 10 + hb_client/src/views/workflow/ticket.vue | 246 ++++++++++++++++--- hb_client/src/views/workflow/transitions.vue | 24 +- 7 files changed, 255 insertions(+), 65 deletions(-) diff --git a/hb_client/src/api/workflow.js b/hb_client/src/api/workflow.js index 74be8dd..5fd2b05 100644 --- a/hb_client/src/api/workflow.js +++ b/hb_client/src/api/workflow.js @@ -146,6 +146,14 @@ export function getTickets(query) { params:query }) } +//新建工单 +export function createTicket(data) { + return request({ + url: '/wf/ticket/', + method: 'post', + data + }) +} //工单详情 export function getTicketDetail(id) { return request({ diff --git a/hb_client/src/views/mtm/process.vue b/hb_client/src/views/mtm/process.vue index 767628f..99654d2 100644 --- a/hb_client/src/views/mtm/process.vue +++ b/hb_client/src/views/mtm/process.vue @@ -16,8 +16,7 @@ fit stripe highlight-current-row - max-height="600" - height="100" + height="100" v-el-height-adaptive-table="{bottomOffset: 50}" > diff --git a/hb_client/src/views/testModel/faceLogin.vue b/hb_client/src/views/testModel/faceLogin.vue index 111a824..335298a 100644 --- a/hb_client/src/views/testModel/faceLogin.vue +++ b/hb_client/src/views/testModel/faceLogin.vue @@ -5,7 +5,7 @@ - +
@@ -22,8 +22,8 @@ props:['src'], data () { return { - videoWidth: 900, - videoHeight: 700, + videoWidth: 500, + videoHeight: 400, videoArr:[],//所有的摄像头 modelSel:'',// myInterval: null, @@ -64,17 +64,14 @@ setImage () { let canvas = document.getElementById("myCanvas"); let context = canvas.getContext('2d'); - var video = document.getElementById("myVideo"); + let video = document.getElementById("myVideo"); context.drawImage(video,0,0,90,68); - var image = new Image(); + let image = new Image(); image = canvas.toDataURL('image/png'); - document.getElementById('res').innerHTML = ''; - console.log(image); - debugger; + document.getElementById('res').innerHTML = ''; let imgData = {base64:image}; faceLogin(imgData).then((res) => { if (res.code >= 200) { - debugger; this.$message.success("成功"); } }); @@ -183,12 +180,12 @@ diff --git a/hb_client/src/views/workflow/index.vue b/hb_client/src/views/workflow/index.vue index 5d8ae3a..c92c762 100644 --- a/hb_client/src/views/workflow/index.vue +++ b/hb_client/src/views/workflow/index.vue @@ -32,11 +32,11 @@ diff --git a/hb_client/src/views/workflow/state.vue b/hb_client/src/views/workflow/state.vue index 8c7062c..7895dca 100644 --- a/hb_client/src/views/workflow/state.vue +++ b/hb_client/src/views/workflow/state.vue @@ -134,6 +134,14 @@ + + + + + + + + @@ -169,6 +177,7 @@ export default { enable_retreat:'', participant_type:'', participant:'', + distribute_type:'', }, participant:'', participants:[], @@ -296,6 +305,7 @@ export default { this.wfstate = Object.assign({}, scope.row); // copy obj this.participants = this.wfstate.participant; this.participant = this.wfstate.participant; + this.wfstate.distribute_type = this.wfstate.distribute_type.toString(); this.dialogType = "edit"; this.dialogVisible = true; this.$nextTick(() => { diff --git a/hb_client/src/views/workflow/ticket.vue b/hb_client/src/views/workflow/ticket.vue index c79eab1..1d0895b 100644 --- a/hb_client/src/views/workflow/ticket.vue +++ b/hb_client/src/views/workflow/ticket.vue @@ -23,17 +23,34 @@ @click="handleFilter" >搜索 +
+ 新增 +
- + + + + @@ -162,8 +179,7 @@ - + @@ -173,27 +189,116 @@
流水号：{{ticketDetail.sn}}
-
开始时间：{{}}
-
请假类型：{{ticketDetail.workflow_.name}}
-
创建人：{{}}
-
请假原因：{{ticketDetail.workflow_.name}}
+
创建时间：{{ticketDetail.create_time}}
标题：{{ticketDetail.title}}
-
结束时间：{{}}
-
创建时间：{{ticketDetail.create_time}}
-
请假天数：{{ticketDetail.ticket_data.days}}
+
{{item.name}}
+ + + + + + + + + + + + + + + + + + + + + + +
+ 取消 + 确认 +
+