bugfix 0704zentao
This commit is contained in:
parent
0ec0e4bed0
commit
f076e23a67
@ -4,7 +4,7 @@
|
|||||||
:visible="dialogVisible"
|
:visible="dialogVisible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true"
|
:close-on-click-modal="configs.clickModalToClose ?? false"
|
||||||
:width="configs.dialogWidth ?? '50%'"
|
:width="configs.dialogWidth ?? '50%'"
|
||||||
:append-to-body="true">
|
:append-to-body="true">
|
||||||
<!-- title -->
|
<!-- title -->
|
||||||
@ -55,7 +55,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
:visible="dialogVisible"
|
:visible="dialogVisible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true"
|
:close-on-click-modal="configs.clickModalToClose ?? false"
|
||||||
:width="configs.dialogWidth ?? '50%'">
|
:width="configs.dialogWidth ?? '50%'">
|
||||||
<!-- title -->
|
<!-- title -->
|
||||||
<div slot="title" class="dialog-title">
|
<div slot="title" class="dialog-title">
|
||||||
@ -81,11 +81,6 @@
|
|||||||
{{ opt[col.customLabel] || "-" }}
|
{{ opt[col.customLabel] || "-" }}
|
||||||
</span>
|
</span>
|
||||||
</el-option>
|
</el-option>
|
||||||
<!-- <el-option
|
|
||||||
v-for="(opt, optIdx) in col.options"
|
|
||||||
:key="'option_' + optIdx"
|
|
||||||
:label="opt.label"
|
|
||||||
:value="opt.value" /> -->
|
|
||||||
</el-select>
|
</el-select>
|
||||||
<el-switch
|
<el-switch
|
||||||
v-if="col.switch"
|
v-if="col.switch"
|
||||||
@ -172,7 +167,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
@ -195,6 +190,7 @@ export default {
|
|||||||
|
|
||||||
this.configs.form.rows.forEach((row) => {
|
this.configs.form.rows.forEach((row) => {
|
||||||
row.forEach((col) => {
|
row.forEach((col) => {
|
||||||
|
if (col == null) return
|
||||||
if (!col.eraseOnSubmit && col.prop) dataForm[col.prop] = col.default ?? null;
|
if (!col.eraseOnSubmit && col.prop) dataForm[col.prop] = col.default ?? null;
|
||||||
else shadowDataForm[col.prop] = col.default ?? null;
|
else shadowDataForm[col.prop] = col.default ?? null;
|
||||||
|
|
||||||
@ -405,6 +401,7 @@ export default {
|
|||||||
|
|
||||||
this.configs.form.rows.forEach((row) => {
|
this.configs.form.rows.forEach((row) => {
|
||||||
row.forEach((col) => {
|
row.forEach((col) => {
|
||||||
|
if (col == null) return
|
||||||
if (col.fetchData && typeof col.fetchData === "function" && !col.hasPrev) {
|
if (col.fetchData && typeof col.fetchData === "function" && !col.hasPrev) {
|
||||||
getData(col);
|
getData(col);
|
||||||
}
|
}
|
||||||
@ -414,6 +411,7 @@ export default {
|
|||||||
/** 必须要遍历两遍 */
|
/** 必须要遍历两遍 */
|
||||||
this.configs.form.rows.forEach((row) => {
|
this.configs.form.rows.forEach((row) => {
|
||||||
row.forEach((col) => {
|
row.forEach((col) => {
|
||||||
|
if (col == null) return
|
||||||
if (col.fetchData && typeof col.fetchData === "function" && col.hasPrev) {
|
if (col.fetchData && typeof col.fetchData === "function" && col.hasPrev) {
|
||||||
console.log("[hasPrev] set watcher: ", col.hasPrev);
|
console.log("[hasPrev] set watcher: ", col.hasPrev);
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
width="30%"
|
width="30%"
|
||||||
:title="title"
|
:title="title"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true">
|
:close-on-click-modal="configs.clickModalToClose ?? false">
|
||||||
<el-upload
|
<el-upload
|
||||||
style="margin-top: 24px; text-align: center"
|
style="margin-top: 24px; text-align: center"
|
||||||
drag
|
drag
|
||||||
@ -69,7 +69,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -279,7 +279,9 @@ export default {
|
|||||||
if (col.upload) dataForm[col.prop] = col.default ?? [];
|
if (col.upload) dataForm[col.prop] = col.default ?? [];
|
||||||
else dataForm[col.prop] = col.default ?? null;
|
else dataForm[col.prop] = col.default ?? null;
|
||||||
|
|
||||||
if (col.autoDisabled) autoDisabledQueue.push(col.prop);
|
if (col.autoDisabled) {
|
||||||
|
autoDisabledQueue.push(col.prop);
|
||||||
|
}
|
||||||
if (!!col.refreshOptionsAfterConfirm) watingToRefreshQueue.push(col);
|
if (!!col.refreshOptionsAfterConfirm) watingToRefreshQueue.push(col);
|
||||||
|
|
||||||
if (col.fetchData)
|
if (col.fetchData)
|
||||||
@ -373,7 +375,6 @@ export default {
|
|||||||
baseDialogConfig: null,
|
baseDialogConfig: null,
|
||||||
subList: [],
|
subList: [],
|
||||||
showSubDialog: false,
|
showSubDialog: false,
|
||||||
disableXXX: false,
|
|
||||||
defaultQuillConfig: {
|
defaultQuillConfig: {
|
||||||
modules: {
|
modules: {
|
||||||
toolbar: [
|
toolbar: [
|
||||||
@ -480,7 +481,7 @@ export default {
|
|||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
disableCondition(prop) {
|
disableCondition(prop) {
|
||||||
return this.detailMode || (this.disableXXX && this.autoDisabledQueue.indexOf(prop) !== -1);
|
return this.detailMode || this.autoDisabledQueue.indexOf(prop) !== -1;
|
||||||
},
|
},
|
||||||
/** utitilities */
|
/** utitilities */
|
||||||
showButton(operate) {
|
showButton(operate) {
|
||||||
@ -497,11 +498,11 @@ export default {
|
|||||||
setTimeout(
|
setTimeout(
|
||||||
() => {
|
() => {
|
||||||
Object.keys(this.dataForm).forEach((key) => {
|
Object.keys(this.dataForm).forEach((key) => {
|
||||||
console.log('reset form, key', key)
|
console.log("reset form, key", key);
|
||||||
if (excludeId && key === "id") return;
|
if (excludeId && key === "id") return;
|
||||||
if ("files" in this.dataForm) this.dataForm.files = [];
|
if ("files" in this.dataForm) this.dataForm.files = [];
|
||||||
else if ("fileIds" in this.dataForm) this.dataForm.fileIds = [];
|
else if ("fileIds" in this.dataForm) this.dataForm.fileIds = [];
|
||||||
else this.$set(this.dataForm, key, null)
|
else this.$set(this.dataForm, key, null);
|
||||||
if (Array.isArray(this.fileList)) {
|
if (Array.isArray(this.fileList)) {
|
||||||
this.fileList = [];
|
this.fileList = [];
|
||||||
}
|
}
|
||||||
|
@ -137,7 +137,7 @@ export default {
|
|||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.upload-demo {
|
.upload-demo {
|
||||||
margin-top: 48px;
|
margin-top: 40px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* .upload-demo >>> .el-upload__tip {
|
/* .upload-demo >>> .el-upload__tip {
|
||||||
|
@ -145,7 +145,7 @@ export default function () {
|
|||||||
// label: "所属工厂",
|
// label: "所属工厂",
|
||||||
// prop: "factoryId",
|
// prop: "factoryId",
|
||||||
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
||||||
// option: [],
|
// options: [],
|
||||||
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
:visible="dialogVisible"
|
:visible="dialogVisible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true"
|
:close-on-click-modal="configs.clickModalToClose ?? false"
|
||||||
>
|
>
|
||||||
<!-- title -->
|
<!-- title -->
|
||||||
<div slot="title" class="dialog-title">
|
<div slot="title" class="dialog-title">
|
||||||
@ -93,7 +93,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
:visible="dialogVisible"
|
:visible="dialogVisible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true"
|
:close-on-click-modal="configs.clickModalToClose ?? false"
|
||||||
>
|
>
|
||||||
<!-- title -->
|
<!-- title -->
|
||||||
<div slot="title" class="dialog-title">
|
<div slot="title" class="dialog-title">
|
||||||
@ -93,7 +93,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -44,11 +44,11 @@ export default function () {
|
|||||||
|
|
||||||
const headFormFields = [
|
const headFormFields = [
|
||||||
{
|
{
|
||||||
label: "关键字",
|
label: "物料配方",
|
||||||
prop: "key",
|
prop: "key",
|
||||||
input: true,
|
input: true,
|
||||||
default: { value: "" },
|
default: { value: "" },
|
||||||
bind: { placeholder: "请输入关键字" },
|
bind: { placeholder: "请输入物料配方" },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
button: {
|
button: {
|
||||||
|
@ -61,7 +61,7 @@ export default function () {
|
|||||||
* 此为后者的配置:
|
* 此为后者的配置:
|
||||||
*/
|
*/
|
||||||
const dialogJustFormConfigs = {
|
const dialogJustFormConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
class="temperature-dialog"
|
class="temperature-dialog"
|
||||||
width="80%"
|
width="80%"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false">
|
:destroy-on-close="false"
|
||||||
|
:close-on-click-modal="false"
|
||||||
|
>
|
||||||
<div class="data-list">
|
<div class="data-list">
|
||||||
<BaseListTable
|
<BaseListTable
|
||||||
v-loading="tableLoading"
|
v-loading="tableLoading"
|
||||||
|
@ -72,7 +72,7 @@ export default function () {
|
|||||||
const carPayloadDialogConfigs = {
|
const carPayloadDialogConfigs = {
|
||||||
dialogWidth: '70%',
|
dialogWidth: '70%',
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -61,7 +61,7 @@ export default function () {
|
|||||||
* 此为后者的配置:
|
* 此为后者的配置:
|
||||||
*/
|
*/
|
||||||
const dialogJustFormConfigs = {
|
const dialogJustFormConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
|
@ -66,7 +66,7 @@ export default function () {
|
|||||||
const carPayloadDialogConfigs = {
|
const carPayloadDialogConfigs = {
|
||||||
dialogWidth: '70%',
|
dialogWidth: '70%',
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -69,7 +69,7 @@ export default function () {
|
|||||||
];
|
];
|
||||||
|
|
||||||
const dialogJustFormConfigs = {
|
const dialogJustFormConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
@ -132,7 +132,7 @@ export default function () {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const carPayloadAddConfigs = {
|
const carPayloadAddConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
@ -210,7 +210,7 @@ export default function () {
|
|||||||
showAdd: true, // 是否显示新增 装载详情,默认为 否
|
showAdd: true, // 是否显示新增 装载详情,默认为 否
|
||||||
dialogWidth: '70%',
|
dialogWidth: '70%',
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -68,7 +68,7 @@ export default function () {
|
|||||||
|
|
||||||
|
|
||||||
const dialogConfigs = {
|
const dialogConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
menu: [{ name: '设备信息', key: 'info' }, { name: '设备属性信息', key: 'attr', onlyEditMode: true }],
|
menu: [{ name: '设备信息', key: 'info' }, { name: '设备属性信息', key: 'attr', onlyEditMode: true }],
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
:visible="visible"
|
:visible="visible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true">
|
:close-on-click-modal="configs.clickModalToClose ?? false">
|
||||||
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
|
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
|
||||||
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
|
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
|
||||||
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
|
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
|
||||||
|
@ -92,7 +92,7 @@ export default {
|
|||||||
carPayloadDialogConfigs: {
|
carPayloadDialogConfigs: {
|
||||||
dialogWidth: "70%",
|
dialogWidth: "70%",
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -83,7 +83,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,8 @@
|
|||||||
width="80%"
|
width="80%"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:append-to-body="true"
|
:append-to-body="true"
|
||||||
:destroy-on-close="false">
|
:destroy-on-close="false"
|
||||||
|
:close-on-click-modal="false">
|
||||||
<div class="data-list">
|
<div class="data-list">
|
||||||
<BaseListTable
|
<BaseListTable
|
||||||
v-loading="tableLoading"
|
v-loading="tableLoading"
|
||||||
|
@ -309,7 +309,7 @@ export default function () {
|
|||||||
// select: true,
|
// select: true,
|
||||||
// label: "客户",
|
// label: "客户",
|
||||||
// prop: "customerId",
|
// prop: "customerId",
|
||||||
// option: [],
|
// options: [],
|
||||||
// optionLabel: "name",
|
// optionLabel: "name",
|
||||||
// fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
|
// fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
|
||||||
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
@ -583,7 +583,7 @@ export default function () {
|
|||||||
select: true,
|
select: true,
|
||||||
label: "客户",
|
label: "客户",
|
||||||
prop: "customerId",
|
prop: "customerId",
|
||||||
option: [],
|
options: [],
|
||||||
optionLabel: "name",
|
optionLabel: "name",
|
||||||
fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
|
fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
@ -84,13 +84,6 @@ export default function () {
|
|||||||
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
// elparams: { placeholder: "请输入烧制工艺名称" },
|
// elparams: { placeholder: "请输入烧制工艺名称" },
|
||||||
// },
|
// },
|
||||||
{
|
|
||||||
input: true,
|
|
||||||
label: "工艺编码",
|
|
||||||
prop: "code",
|
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
|
||||||
elparams: { placeholder: "请输入烧制工艺编码" },
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
select: true,
|
select: true,
|
||||||
label: "配方",
|
label: "配方",
|
||||||
@ -107,6 +100,14 @@ export default function () {
|
|||||||
toProp: 'code'
|
toProp: 'code'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
input: true,
|
||||||
|
autoDisabled: true,
|
||||||
|
label: "工艺编码",
|
||||||
|
prop: "code",
|
||||||
|
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
elparams: { placeholder: "请输入烧制工艺编码" },
|
||||||
|
},
|
||||||
],
|
],
|
||||||
// [
|
// [
|
||||||
// {
|
// {
|
||||||
|
@ -69,7 +69,7 @@ export default function () {
|
|||||||
];
|
];
|
||||||
|
|
||||||
const dialogJustFormConfigs = {
|
const dialogJustFormConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
@ -133,7 +133,7 @@ export default function () {
|
|||||||
|
|
||||||
const carPayloadAddConfigs = null
|
const carPayloadAddConfigs = null
|
||||||
// const carPayloadAddConfigs = {
|
// const carPayloadAddConfigs = {
|
||||||
// clickModalToClose: true,
|
// clickModalToClose: false,
|
||||||
// form: {
|
// form: {
|
||||||
// rows: [
|
// rows: [
|
||||||
// [
|
// [
|
||||||
@ -200,7 +200,7 @@ export default function () {
|
|||||||
const carPayloadDialogConfigs = {
|
const carPayloadDialogConfigs = {
|
||||||
dialogWidth: '70%',
|
dialogWidth: '70%',
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
:visible="dialogVisible"
|
:visible="dialogVisible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true"
|
:close-on-click-modal="configs.clickModalToClose ?? false"
|
||||||
>
|
>
|
||||||
<!-- title -->
|
<!-- title -->
|
||||||
<div slot="title" class="dialog-title">
|
<div slot="title" class="dialog-title">
|
||||||
@ -97,7 +97,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -13,7 +13,7 @@ export default function () {
|
|||||||
// { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
|
// { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
|
||||||
{ prop: "material", label: "原料" },
|
{ prop: "material", label: "原料" },
|
||||||
{ prop: "qty", label: "料位" },
|
{ prop: "qty", label: "料位" },
|
||||||
{ prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
|
// { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
|
||||||
{ prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter('material_category') },
|
{ prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter('material_category') },
|
||||||
{ prop: "density", label: "原料堆积密度" },
|
{ prop: "density", label: "原料堆积密度" },
|
||||||
{ prop: "dosLow", label: "加料下限" },
|
{ prop: "dosLow", label: "加料下限" },
|
||||||
|
@ -117,7 +117,7 @@ export default function () {
|
|||||||
* 此为后者的配置:
|
* 此为后者的配置:
|
||||||
*/
|
*/
|
||||||
const dialogJustFormConfigs = {
|
const dialogJustFormConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
:visible="visible"
|
:visible="visible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true">
|
:close-on-click-modal="configs.clickModalToClose ?? false">
|
||||||
<!-- title -->
|
<!-- title -->
|
||||||
<div slot="title" class="dialog-title">
|
<div slot="title" class="dialog-title">
|
||||||
<h2 class="">
|
<h2 class="">
|
||||||
@ -109,7 +109,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
width="30%"
|
width="30%"
|
||||||
:title="title"
|
:title="title"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true">
|
:close-on-click-modal="configs.clickModalToClose ?? false">
|
||||||
<el-upload
|
<el-upload
|
||||||
style="margin-top: 24px; text-align: center"
|
style="margin-top: 24px; text-align: center"
|
||||||
drag
|
drag
|
||||||
@ -68,7 +68,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
:visible="visible"
|
:visible="visible"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:destroy-on-close="false"
|
:destroy-on-close="false"
|
||||||
:close-on-click-modal="configs.clickModalToClose ?? true">
|
:close-on-click-modal="configs.clickModalToClose ?? false">
|
||||||
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
|
<div slot="title" style="background: #eee; padding: 8px; text-align: center; border-bottom: 1px solid #ccc">
|
||||||
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
|
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
|
||||||
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
|
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>
|
||||||
|
@ -92,7 +92,7 @@ export default {
|
|||||||
carPayloadDialogConfigs: {
|
carPayloadDialogConfigs: {
|
||||||
dialogWidth: "70%",
|
dialogWidth: "70%",
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -83,7 +83,7 @@ export default {
|
|||||||
configs: {
|
configs: {
|
||||||
type: Object,
|
type: Object,
|
||||||
default: () => ({
|
default: () => ({
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
forms: null,
|
forms: null,
|
||||||
}),
|
}),
|
||||||
},
|
},
|
||||||
|
@ -6,7 +6,8 @@
|
|||||||
width="80%"
|
width="80%"
|
||||||
@close="handleClose"
|
@close="handleClose"
|
||||||
:append-to-body="true"
|
:append-to-body="true"
|
||||||
:destroy-on-close="false">
|
:destroy-on-close="false"
|
||||||
|
:close-on-click-modal="false">
|
||||||
<div class="data-list">
|
<div class="data-list">
|
||||||
<BaseListTable
|
<BaseListTable
|
||||||
v-loading="tableLoading"
|
v-loading="tableLoading"
|
||||||
|
@ -499,7 +499,7 @@ export default function () {
|
|||||||
select: true,
|
select: true,
|
||||||
label: "客户",
|
label: "客户",
|
||||||
prop: "customerId",
|
prop: "customerId",
|
||||||
option: [],
|
options: [],
|
||||||
optionLabel: "name",
|
optionLabel: "name",
|
||||||
fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
|
fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
@ -121,7 +121,7 @@ export default function () {
|
|||||||
const carPayloadDialogConfigs = {
|
const carPayloadDialogConfigs = {
|
||||||
dialogWidth: '70%',
|
dialogWidth: '70%',
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -69,7 +69,7 @@ export default function () {
|
|||||||
];
|
];
|
||||||
|
|
||||||
const dialogJustFormConfigs = {
|
const dialogJustFormConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
@ -132,7 +132,7 @@ export default function () {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const carPayloadAddConfigs = {
|
const carPayloadAddConfigs = {
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
form: {
|
form: {
|
||||||
rows: [
|
rows: [
|
||||||
[
|
[
|
||||||
@ -209,7 +209,7 @@ export default function () {
|
|||||||
showAdd: true,
|
showAdd: true,
|
||||||
dialogWidth: '70%',
|
dialogWidth: '70%',
|
||||||
carPayloadDialog: true,
|
carPayloadDialog: true,
|
||||||
clickModalToClose: true,
|
clickModalToClose: false,
|
||||||
tableConfig: {
|
tableConfig: {
|
||||||
table: null,
|
table: null,
|
||||||
column: [
|
column: [
|
||||||
|
@ -43,7 +43,7 @@ export default function () {
|
|||||||
|
|
||||||
const headFormFields = [
|
const headFormFields = [
|
||||||
{
|
{
|
||||||
label: "关键字",
|
label: "物料名称/编码",
|
||||||
prop: "key",
|
prop: "key",
|
||||||
input: true,
|
input: true,
|
||||||
default: { value: "" },
|
default: { value: "" },
|
||||||
@ -94,7 +94,7 @@ export default function () {
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
input: true,
|
input: true,
|
||||||
label: "物料名称/砖型名称",
|
label: "物料描述",
|
||||||
prop: "name",
|
prop: "name",
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
elparams: { placeholder: "请输入设备名称" },
|
elparams: { placeholder: "请输入设备名称" },
|
||||||
@ -139,12 +139,28 @@ export default function () {
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
input: true,
|
input: true,
|
||||||
label: "产线完成单位产品用时(s)",
|
label: "产线完成单位产品用时",
|
||||||
prop: "processTime",
|
prop: "processTime",
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
rules: [
|
||||||
|
{ required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
{ type: 'number', message: "请输入数字类型", trigger: "blur", transform: val => Number(val) }
|
||||||
|
],
|
||||||
elparams: { placeholder: "请输入规格" },
|
elparams: { placeholder: "请输入规格" },
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
input: true,
|
||||||
|
label: "重量",
|
||||||
|
prop: "weight",
|
||||||
|
rules: [
|
||||||
|
{ required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
{ type: 'number', message: "请输入数字类型", trigger: "blur", transform: val => Number(val) }
|
||||||
|
],
|
||||||
|
elparams: { placeholder: "请输入重量" },
|
||||||
|
},
|
||||||
|
|
||||||
|
],
|
||||||
[{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
|
[{ textarea: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
|
||||||
],
|
],
|
||||||
operations: [
|
operations: [
|
||||||
|
@ -81,7 +81,7 @@ export default function () {
|
|||||||
label: "所属工厂",
|
label: "所属工厂",
|
||||||
prop: "factoryId",
|
prop: "factoryId",
|
||||||
fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
||||||
option: [],
|
options: [],
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@ -131,7 +131,7 @@ export default async function () {
|
|||||||
label: "所属工厂",
|
label: "所属工厂",
|
||||||
prop: "factoryId",
|
prop: "factoryId",
|
||||||
fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
||||||
option: [],
|
options: [],
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
@ -2,6 +2,7 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationC
|
|||||||
import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
|
import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
|
||||||
import request from "@/utils/request";
|
import request from "@/utils/request";
|
||||||
import { timeFilter, dictFilter } from "@/utils/filters";
|
import { timeFilter, dictFilter } from "@/utils/filters";
|
||||||
|
import { getDictDataList } from '@/utils'
|
||||||
|
|
||||||
export default function () {
|
export default function () {
|
||||||
const tableProps = [
|
const tableProps = [
|
||||||
@ -82,7 +83,7 @@ export default function () {
|
|||||||
// label: "所属工厂",
|
// label: "所属工厂",
|
||||||
// prop: "factoryId",
|
// prop: "factoryId",
|
||||||
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
||||||
// option: [],
|
// options: [],
|
||||||
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
@ -107,14 +108,23 @@ export default function () {
|
|||||||
},
|
},
|
||||||
{ input: true, label: "短描述", prop: "shortDesc", elparams: { placeholder: "短描述" } },
|
{ input: true, label: "短描述", prop: "shortDesc", elparams: { placeholder: "短描述" } },
|
||||||
],
|
],
|
||||||
|
[
|
||||||
|
{
|
||||||
|
select: true,
|
||||||
|
label: "中心线颜色",
|
||||||
|
prop: "line",
|
||||||
|
options: getDictDataList('line').map(_ => ({ label: _.dictLabel, value: _.dictValue })),
|
||||||
|
rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
||||||
|
},
|
||||||
|
{
|
||||||
|
upload: true,
|
||||||
|
actionUrl: window.SITE_CONFIG['apiURL'] + '/pms/attachment/uploadFileFormData?typeCode=shape',
|
||||||
|
label: "上传资料",
|
||||||
|
prop: "files",
|
||||||
|
elparams: null
|
||||||
|
}
|
||||||
|
],
|
||||||
[{ textarea: true, label: "描述", prop: "description", elparams: { placeholder: "描述" } }],
|
[{ textarea: true, label: "描述", prop: "description", elparams: { placeholder: "描述" } }],
|
||||||
[{
|
|
||||||
upload: true,
|
|
||||||
actionUrl: window.SITE_CONFIG['apiURL'] + '/pms/attachment/uploadFileFormData?typeCode=shape',
|
|
||||||
label: "上传资料",
|
|
||||||
prop: "files",
|
|
||||||
elparams: null
|
|
||||||
}],
|
|
||||||
[{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
|
[{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
|
||||||
],
|
],
|
||||||
operations: [
|
operations: [
|
||||||
|
@ -84,13 +84,6 @@ export default function () {
|
|||||||
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
// elparams: { placeholder: "请输入混料程序名称" },
|
// elparams: { placeholder: "请输入混料程序名称" },
|
||||||
// },
|
// },
|
||||||
{
|
|
||||||
input: true,
|
|
||||||
label: "工艺编码",
|
|
||||||
prop: "code",
|
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
|
||||||
elparams: { placeholder: "请输入混料程序编码" },
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
select: true,
|
select: true,
|
||||||
label: "砖型",
|
label: "砖型",
|
||||||
@ -106,6 +99,14 @@ export default function () {
|
|||||||
toProp: 'code'
|
toProp: 'code'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
input: true,
|
||||||
|
autoDisabled: true,
|
||||||
|
label: "工艺编码",
|
||||||
|
prop: "code",
|
||||||
|
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
elparams: { placeholder: "请输入混料程序编码" }, // disabled: true },
|
||||||
|
},
|
||||||
],
|
],
|
||||||
// [
|
// [
|
||||||
// {
|
// {
|
||||||
|
@ -114,7 +114,7 @@ export default function () {
|
|||||||
// label: "所属工厂",
|
// label: "所属工厂",
|
||||||
// prop: "factoryId",
|
// prop: "factoryId",
|
||||||
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
|
||||||
// option: [],
|
// options: [],
|
||||||
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
|
@ -85,13 +85,6 @@ export default function () {
|
|||||||
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
// elparams: { placeholder: "请输入混料程序名称" },
|
// elparams: { placeholder: "请输入混料程序名称" },
|
||||||
// },
|
// },
|
||||||
{
|
|
||||||
input: true,
|
|
||||||
label: "工艺编码",
|
|
||||||
prop: "code",
|
|
||||||
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
|
||||||
elparams: { placeholder: "请输入混料程序编码" },
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
select: true,
|
select: true,
|
||||||
label: "砖型",
|
label: "砖型",
|
||||||
@ -108,6 +101,14 @@ export default function () {
|
|||||||
toProp: 'code'
|
toProp: 'code'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
input: true,
|
||||||
|
autoDisabled: true,
|
||||||
|
label: "工艺编码",
|
||||||
|
prop: "code",
|
||||||
|
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
|
||||||
|
elparams: { placeholder: "请输入混料程序编码" },
|
||||||
|
},
|
||||||
],
|
],
|
||||||
// [
|
// [
|
||||||
// {
|
// {
|
||||||
|
Loading…
Reference in New Issue
Block a user