mt-fe-group/pms-aomei
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfix 0704zentao

Browse Source
This commit is contained in:
lb 2023-07-05 11:18:08 +08:00
parent 0ec0e4bed0
commit f076e23a67
42 changed files with 127 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/DialogCarPayload.vue
View File

@ -4,7 +4,7 @@
:visible="dialogVisible"
@close="handleClose"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true"
:close-on-click-modal="configs.clickModalToClose ?? false"
:width="configs.dialogWidth ?? '50%'"
:append-to-body="true">
<!-- title -->
@ -55,7 +55,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

12
src/components/DialogJustForm.vue
View File

@ -4,7 +4,7 @@
:visible="dialogVisible"
@close="handleClose"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true"
:close-on-click-modal="configs.clickModalToClose ?? false"
:width="configs.dialogWidth ?? '50%'">
<!-- title -->
<div slot="title" class="dialog-title">
@ -81,11 +81,6 @@
{{ opt[col.customLabel] || "-" }}
</span>
</el-option>
<!-- <el-option
v-for="(opt, optIdx) in col.options"
:key="'option_' + optIdx"
:label="opt.label"
:value="opt.value" /> -->
</el-select>
<el-switch
v-if="col.switch"
@ -172,7 +167,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},
@ -195,6 +190,7 @@ export default {
this.configs.form.rows.forEach((row) => {
row.forEach((col) => {
if (col == null) return
if (!col.eraseOnSubmit && col.prop) dataForm[col.prop] = col.default ?? null;
else shadowDataForm[col.prop] = col.default ?? null;
@ -405,6 +401,7 @@ export default {
this.configs.form.rows.forEach((row) => {
row.forEach((col) => {
if (col == null) return
if (col.fetchData && typeof col.fetchData === "function" && !col.hasPrev) {
getData(col);
}
@ -414,6 +411,7 @@ export default {
/** 必须要遍历两遍 */
this.configs.form.rows.forEach((row) => {
row.forEach((col) => {
if (col == null) return
if (col.fetchData && typeof col.fetchData === "function" && col.hasPrev) {
console.log("[hasPrev] set watcher: ", col.hasPrev);

4
src/components/DialogUpload.vue
View File

@ -6,7 +6,7 @@
width="30%"
:title="title"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true">
:close-on-click-modal="configs.clickModalToClose ?? false">
<el-upload
style="margin-top: 24px; text-align: center"
drag
@ -69,7 +69,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

11
src/components/DialogWithMenu.vue
View File

@ -279,7 +279,9 @@ export default {
if (col.upload) dataForm[col.prop] = col.default ?? [];
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.fetchData)
@ -373,7 +375,6 @@ export default {
baseDialogConfig: null,
subList: [],
showSubDialog: false,
disableXXX: false,
defaultQuillConfig: {
modules: {
toolbar: [
@ -480,7 +481,7 @@ export default {
methods: {
disableCondition(prop) {
return this.detailMode || (this.disableXXX && this.autoDisabledQueue.indexOf(prop) !== -1);
return this.detailMode || this.autoDisabledQueue.indexOf(prop) !== -1;
},
/** utitilities */
showButton(operate) {
@ -497,11 +498,11 @@ export default {
setTimeout(
() => {
Object.keys(this.dataForm).forEach((key) => {
console.log('reset form, key', key)
console.log("reset form, key", key);
if (excludeId && key === "id") return;
if ("files" in this.dataForm) this.dataForm.files = [];
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)) {
this.fileList = [];
}

2
src/components/uploadBtn/index.vue
View File

@ -137,7 +137,7 @@ export default {
<style scoped>
.upload-demo {
margin-top: 48px;
margin-top: 40px;
}
/* .upload-demo >>> .el-upload__tip {

2
src/views/modules/pms/agvMission/config.js
View File

@ -145,7 +145,7 @@ export default function () {
// label: "所属工厂",
// prop: "factoryId",
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
// option: [],
// options: [],
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
// },
// {

4
src/views/modules/pms/blenderOrder/components/edit-dialog.vue
View File

@ -4,7 +4,7 @@
:visible="dialogVisible"
@close="handleClose"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true"
:close-on-click-modal="configs.clickModalToClose ?? false"
>
<!-- title -->
<div slot="title" class="dialog-title">
@ -93,7 +93,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

4
src/views/modules/pms/blenderPress/components/edit-dialog.vue
View File

@ -4,7 +4,7 @@
:visible="dialogVisible"
@close="handleClose"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true"
:close-on-click-modal="configs.clickModalToClose ?? false"
>
<!-- title -->
<div slot="title" class="dialog-title">
@ -93,7 +93,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

4
src/views/modules/pms/bom/config.js
View File

@ -44,11 +44,11 @@ export default function () {
const headFormFields = [
{
label: "关键字",
label: "物料配方",
prop: "key",
input: true,
default: { value: "" },
bind: { placeholder: "请输入关键字" },
bind: { placeholder: "请输入物料配方" },
},
{
button: {

2
src/views/modules/pms/car/config.js
View File

@ -61,7 +61,7 @@ export default function () {
* 此为后者的配置:
*/
const dialogJustFormConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[

4
src/views/modules/pms/carHistory/components/temperatureDialog.vue
View File

@ -5,7 +5,9 @@
class="temperature-dialog"
width="80%"
@close="handleClose"
:destroy-on-close="false">
:destroy-on-close="false"
:close-on-click-modal="false"
>
<div class="data-list">
<BaseListTable
v-loading="tableLoading"

2
src/views/modules/pms/carHistory/config.js
View File

@ -72,7 +72,7 @@ export default function () {
const carPayloadDialogConfigs = {
dialogWidth: '70%',
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

2
src/views/modules/pms/carPayload/config.js
View File

@ -61,7 +61,7 @@ export default function () {
* 此为后者的配置:
*/
const dialogJustFormConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[

2
src/views/modules/pms/currentCarLocation/config.js
View File

@ -66,7 +66,7 @@ export default function () {
const carPayloadDialogConfigs = {
dialogWidth: '70%',
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

6
src/views/modules/pms/detectionPlatform/config.js
View File

@ -69,7 +69,7 @@ export default function () {
];
const dialogJustFormConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[
@ -132,7 +132,7 @@ export default function () {
};
const carPayloadAddConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[
@ -210,7 +210,7 @@ export default function () {
showAdd: true, // 是否显示新增 装载详情，默认为 否
dialogWidth: '70%',
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

2
src/views/modules/pms/equipment/config.js
View File

@ -68,7 +68,7 @@ export default function () {
const dialogConfigs = {
clickModalToClose: true,
clickModalToClose: false,
menu: [{ name: '设备信息', key: 'info' }, { name: '设备属性信息', key: 'attr', onlyEditMode: true }],
form: {
rows: [

2
src/views/modules/pms/finishedOrder/components/DialogWithMenu.vue
View File

@ -6,7 +6,7 @@
:visible="visible"
@close="handleClose"
: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">
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>

2
src/views/modules/pms/finishedOrder/components/tabs/carDetail.vue
View File

@ -92,7 +92,7 @@ export default {
carPayloadDialogConfigs: {
dialogWidth: "70%",
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

2
src/views/modules/pms/finishedOrder/components/tabs/orderDetail.vue
View File

@ -83,7 +83,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

3
src/views/modules/pms/finishedOrder/components/tabs/temperatureDialog.vue
View File

@ -6,7 +6,8 @@
width="80%"
@close="handleClose"
:append-to-body="true"
:destroy-on-close="false">
:destroy-on-close="false"
:close-on-click-modal="false">
<div class="data-list">
<BaseListTable
v-loading="tableLoading"

4
src/views/modules/pms/finishedOrder/config.js
View File

@ -309,7 +309,7 @@ export default function () {
// select: true,
// label: "客户",
// prop: "customerId",
// option: [],
// options: [],
// optionLabel: "name",
// fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
@ -583,7 +583,7 @@ export default function () {
select: true,
label: "客户",
prop: "customerId",
option: [],
options: [],
optionLabel: "name",
fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
rules: { required: true, message: "必填项不能为空", trigger: "blur" },

15
src/views/modules/pms/firingStep/config.js
View File

@ -84,13 +84,6 @@ export default function () {
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入烧制工艺名称" },
// },
{
input: true,
label: "工艺编码",
prop: "code",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入烧制工艺编码" },
},
{
select: true,
label: "配方",
@ -107,6 +100,14 @@ export default function () {
toProp: 'code'
}
},
{
input: true,
autoDisabled: true,
label: "工艺编码",
prop: "code",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入烧制工艺编码" },
},
],
// [
// {

6
src/views/modules/pms/kilnWaitingRoom/config.js
View File

@ -69,7 +69,7 @@ export default function () {
];
const dialogJustFormConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[
@ -133,7 +133,7 @@ export default function () {
const carPayloadAddConfigs = null
// const carPayloadAddConfigs = {
// clickModalToClose: true,
// clickModalToClose: false,
// form: {
// rows: [
// [
@ -200,7 +200,7 @@ export default function () {
const carPayloadDialogConfigs = {
dialogWidth: '70%',
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

4
src/views/modules/pms/material/components/DialogJustForm.vue
View File

@ -4,7 +4,7 @@
:visible="dialogVisible"
@close="handleClose"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true"
:close-on-click-modal="configs.clickModalToClose ?? false"
>
<!-- title -->
<div slot="title" class="dialog-title">
@ -97,7 +97,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

2
src/views/modules/pms/materialStorageDynamic/config.js
View File

@ -13,7 +13,7 @@ export default function () {
// { prop: "enabled", label: "状态", subcomponent: switchBtn }, // subcomponent
{ prop: "material", label: "原料" },
{ prop: "qty", label: "料位" },
{ prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
// { prop: "unitDictValue", label: "单位", filter: dictFilter('unit') },
{ prop: "materialTypeDictValue", label: "原料类型", filter: dictFilter('material_category') },
{ prop: "density", label: "原料堆积密度" },
{ prop: "dosLow", label: "加料下限" },

2
src/views/modules/pms/materialUpload/config.js
View File

@ -117,7 +117,7 @@ export default function () {
* 此为后者的配置:
*/
const dialogJustFormConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[

4
src/views/modules/pms/order/components/DialogJustForm.vue
View File

@ -5,7 +5,7 @@
:visible="visible"
@close="handleClose"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true">
:close-on-click-modal="configs.clickModalToClose ?? false">
<!-- title -->
<div slot="title" class="dialog-title">
<h2 class="">
@ -109,7 +109,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

4
src/views/modules/pms/order/components/DialogUpload.vue
View File

@ -6,7 +6,7 @@
width="30%"
:title="title"
:destroy-on-close="false"
:close-on-click-modal="configs.clickModalToClose ?? true">
:close-on-click-modal="configs.clickModalToClose ?? false">
<el-upload
style="margin-top: 24px; text-align: center"
drag
@ -68,7 +68,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

2
src/views/modules/pms/order/components/DialogWithMenu.vue
View File

@ -6,7 +6,7 @@
:visible="visible"
@close="handleClose"
: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">
<el-checkbox-group v-model="activeTab" @change="handleTabClick">
<el-checkbox-button :true-label="1">子订单进度</el-checkbox-button>

2
src/views/modules/pms/order/components/tabs/carDetail.vue
View File

@ -92,7 +92,7 @@ export default {
carPayloadDialogConfigs: {
dialogWidth: "70%",
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

2
src/views/modules/pms/order/components/tabs/orderDetail.vue
View File

@ -83,7 +83,7 @@ export default {
configs: {
type: Object,
default: () => ({
clickModalToClose: true,
clickModalToClose: false,
forms: null,
}),
},

3
src/views/modules/pms/order/components/tabs/temperatureDialog.vue
View File

@ -6,7 +6,8 @@
width="80%"
@close="handleClose"
:append-to-body="true"
:destroy-on-close="false">
:destroy-on-close="false"
:close-on-click-modal="false">
<div class="data-list">
<BaseListTable
v-loading="tableLoading"

2
src/views/modules/pms/order/config.js
View File

@ -499,7 +499,7 @@ export default function () {
select: true,
label: "客户",
prop: "customerId",
option: [],
options: [],
optionLabel: "name",
fetchData: () => this.$http.get("/pms/customer/page", { params: { limit: 999, page: 1, name: "" } }),
rules: { required: true, message: "必填项不能为空", trigger: "blur" },

2
src/views/modules/pms/pallet/config.js
View File

@ -121,7 +121,7 @@ export default function () {
const carPayloadDialogConfigs = {
dialogWidth: '70%',
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

6
src/views/modules/pms/palletizingLine/config.js
View File

@ -69,7 +69,7 @@ export default function () {
];
const dialogJustFormConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[
@ -132,7 +132,7 @@ export default function () {
};
const carPayloadAddConfigs = {
clickModalToClose: true,
clickModalToClose: false,
form: {
rows: [
[
@ -209,7 +209,7 @@ export default function () {
showAdd: true,
dialogWidth: '70%',
carPayloadDialog: true,
clickModalToClose: true,
clickModalToClose: false,
tableConfig: {
table: null,
column: [

24
src/views/modules/pms/product/config.js
View File

@ -43,7 +43,7 @@ export default function () {
const headFormFields = [
{
label: "关键字",
label: "物料名称/编码",
prop: "key",
input: true,
default: { value: "" },
@ -94,7 +94,7 @@ export default function () {
[
{
input: true,
label: "物料名称/砖型名称",
label: "物料描述",
prop: "name",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入设备名称" },
@ -139,12 +139,28 @@ export default function () {
},
{
input: true,
label: "产线完成单位产品用时(s)",
label: "产线完成单位产品用时",
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: "请输入规格" },
},
],
[
{
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: "备注" } }],
],
operations: [

2
src/views/modules/pms/productionLine/config.js
View File

@ -81,7 +81,7 @@ export default function () {
label: "所属工厂",
prop: "factoryId",
fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
option: [],
options: [],
rules: { required: true, message: "必填项不能为空", trigger: "change" },
},
],

2
src/views/modules/pms/reportSheet/config copy.js
View File

@ -131,7 +131,7 @@ export default async function () {
label: "所属工厂",
prop: "factoryId",
fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
option: [],
options: [],
rules: { required: true, message: "必填项不能为空", trigger: "change" },
},
],

26
src/views/modules/pms/shape/config.js
View File

@ -2,6 +2,7 @@ import TableOperaionComponent from "@/components/noTemplateComponents/operationC
import TableTextComponent from "@/components/noTemplateComponents/detailComponent";
import request from "@/utils/request";
import { timeFilter, dictFilter } from "@/utils/filters";
import { getDictDataList } from '@/utils'
export default function () {
const tableProps = [
@ -82,7 +83,7 @@ export default function () {
// label: "所属工厂",
// prop: "factoryId",
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
// option: [],
// options: [],
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
// },
// {
@ -107,14 +108,23 @@ export default function () {
},
{ 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: "描述" } }],
[{
upload: true,
actionUrl: window.SITE_CONFIG['apiURL'] + '/pms/attachment/uploadFileFormData?typeCode=shape',
label: "上传资料",
prop: "files",
elparams: null
}],
[{ input: true, label: "备注", prop: "remark", elparams: { placeholder: "备注" } }],
],
operations: [

15
src/views/modules/pms/shapeStep/config.js
View File

@ -84,13 +84,6 @@ export default function () {
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入混料程序名称" },
// },
{
input: true,
label: "工艺编码",
prop: "code",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入混料程序编码" },
},
{
select: true,
label: "砖型",
@ -106,6 +99,14 @@ export default function () {
toProp: 'code'
}
},
{
input: true,
autoDisabled: true,
label: "工艺编码",
prop: "code",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入混料程序编码" }, // disabled: true },
},
],
// [
// {

2
src/views/modules/pms/supplier/config.js
View File

@ -114,7 +114,7 @@ export default function () {
// label: "所属工厂",
// prop: "factoryId",
// fetchData: () => this.$http.get("/pms/factory/page", { params: { limit: 999, page: 1 } }),
// option: [],
// options: [],
// rules: { required: true, message: "必填项不能为空", trigger: "change" },
// },
// {

15
src/views/modules/pms/testingStep/config.js
View File

@ -85,13 +85,6 @@ export default function () {
// rules: { required: true, message: "必填项不能为空", trigger: "blur" },
// elparams: { placeholder: "请输入混料程序名称" },
// },
{
input: true,
label: "工艺编码",
prop: "code",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入混料程序编码" },
},
{
select: true,
label: "砖型",
@ -108,6 +101,14 @@ export default function () {
toProp: 'code'
}
},
{
input: true,
autoDisabled: true,
label: "工艺编码",
prop: "code",
rules: { required: true, message: "必填项不能为空", trigger: "blur" },
elparams: { placeholder: "请输入混料程序编码" },
},
],
// [
// {