'merge'
This commit is contained in:
commit
2075b42427
4
.env.dev
4
.env.dev
@ -1,8 +1,8 @@
|
||||
###
|
||||
# @Author: Do not edit
|
||||
# @Date: 2023-08-29 09:40:39
|
||||
# @LastEditTime: 2023-10-27 16:17:13
|
||||
# @LastEditors: DY
|
||||
# @LastEditTime: 2023-10-30 10:49:39
|
||||
# @LastEditors: zhp
|
||||
# @Description:
|
||||
###
|
||||
# 开发环境配置
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-10-17 16:50:19
|
||||
* @LastEditTime: 2023-10-18 15:31:12
|
||||
* @LastEditTime: 2023-10-30 10:47:13
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -30,17 +30,15 @@
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="所属工单" prop="workOrderId">
|
||||
<el-select v-model="dataForm.workOrderId" style="width: 100%;" placeholder="请选择所属工单">
|
||||
<el-option v-for="dict in workOrderList" clearable :key="dict.id" :label="dict.name"
|
||||
:value="dict.id" />
|
||||
<el-select v-model="dataForm.workOrderId" style="width: 100%;" placeholder="请选择所属工单" clearable>
|
||||
<el-option v-for="dict in workOrderList" :key="dict.id" :label="dict.name" :value="dict.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="客户" prop="customerId">
|
||||
<el-select v-model="dataForm.customerId" style="width: 100%;" placeholder="请选择客户">
|
||||
<el-option v-for="dict in customerList" clearable :key="dict.id" :label="dict.name"
|
||||
:value="dict.id" />
|
||||
<el-select v-model="dataForm.customerId" style="width: 100%;" placeholder="请选择客户" clearable>
|
||||
<el-option v-for="dict in customerList" :key="dict.id" :label="dict.name" :value="dict.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -48,9 +46,8 @@
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标签模板" prop="modelId">
|
||||
<el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板">
|
||||
<el-option v-for="dict in modelList" clearable :key="dict.id"
|
||||
:label="dict.name" :value="dict.id" />
|
||||
<el-select v-model="dataForm.modelId" style="width: 100%;" placeholder="请选择标签模板" clearable>
|
||||
<el-option v-for="dict in modelList" :key="dict.id" :label="dict.name" :value="dict.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -196,10 +193,10 @@ export default {
|
||||
total: 0,
|
||||
},
|
||||
dataRule: {
|
||||
code: [
|
||||
content: [
|
||||
{
|
||||
required: true,
|
||||
message: '产品编码不能为空',
|
||||
message: '内容不能为空',
|
||||
trigger: 'blur',
|
||||
},
|
||||
// {
|
||||
@ -209,11 +206,11 @@ export default {
|
||||
// transfom: 'val => Number(val)',
|
||||
// },
|
||||
],
|
||||
name: [
|
||||
workOrderId: [
|
||||
{
|
||||
required: true,
|
||||
message: '产品名称不能为空',
|
||||
trigger: 'blur',
|
||||
message: '所属工单不能为空',
|
||||
trigger: 'change',
|
||||
},
|
||||
],
|
||||
typeDictValue: [
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2023-08-01 14:55:51
|
||||
* @LastEditors: zhp
|
||||
* @LastEditTime: 2023-10-20 15:05:09
|
||||
* @LastEditTime: 2023-10-30 10:44:48
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -184,6 +184,7 @@ export default {
|
||||
});
|
||||
},
|
||||
handlePrint(id) {
|
||||
if (id) {
|
||||
getPackingModel(id).then(res => {
|
||||
var obj = {
|
||||
code: '11111222',
|
||||
@ -243,7 +244,12 @@ export default {
|
||||
});
|
||||
console.log(hiprintTemplate)
|
||||
})
|
||||
// })
|
||||
} else {
|
||||
this.$message({
|
||||
message: '请选择打印标签模板',
|
||||
type: 'warning'
|
||||
});
|
||||
}
|
||||
},
|
||||
closeCallback(vue) {
|
||||
console.log('关闭了打印工具')
|
||||
|
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: zhp
|
||||
* @Date: 2023-10-17 16:50:19
|
||||
* @LastEditTime: 2023-10-20 14:13:39
|
||||
* @LastEditTime: 2023-10-30 10:41:07
|
||||
* @LastEditors: zhp
|
||||
* @Description:
|
||||
-->
|
||||
@ -23,8 +23,8 @@
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
<el-form-item label="标签类型" prop="typeId">
|
||||
<el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择打印方式">
|
||||
<el-option v-for="dict in typeList" clearable :key="dict.id" :label="dict.name" :value="dict.id" />
|
||||
<el-select v-model="dataForm.typeId" style="width: 100%;" placeholder="请选择打印方式" clearable>
|
||||
<el-option v-for="dict in typeList" :key="dict.id" :label="dict.name" :value="dict.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
@ -32,9 +32,8 @@
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="12">
|
||||
<el-form-item label="打印方式" prop="printModel">
|
||||
<el-select v-model="dataForm.printModel" style="width: 100%;" placeholder="请选择打印方式">
|
||||
<el-option v-for="dict in printModelList" clearable :key="dict.id" :label="dict.name"
|
||||
:value="dict.id" />
|
||||
<el-select v-model="dataForm.printModel" style="width: 100%;" placeholder="请选择打印方式" clearable>
|
||||
<el-option v-for="dict in printModelList" :key="dict.id" :label="dict.name" :value="dict.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
@ -2,7 +2,7 @@
|
||||
* @Author: zwq
|
||||
* @Date: 2023-08-01 14:55:51
|
||||
* @LastEditors: zhp
|
||||
* @LastEditTime: 2023-10-20 14:21:33
|
||||
* @LastEditTime: 2023-10-30 10:45:23
|
||||
* @Description:
|
||||
-->
|
||||
<template>
|
||||
@ -191,7 +191,7 @@ export default {
|
||||
// this.content = JSON.stringify(data)
|
||||
this.obj.content = JSON.stringify(data)
|
||||
updatePackingModel(this.obj).then((response) => {
|
||||
this.$modal.msgSuccess('修改成功');
|
||||
// this.$modal.msgSuccess('修改成功');
|
||||
// this.visible = false;
|
||||
// this.$emit('refreshDataList');
|
||||
});
|
||||
|
Loading…
Reference in New Issue
Block a user