From fef86e28aa65fe0fc6d9436af305923f46e32b96 Mon Sep 17 00:00:00 2001 From: kilo Date: Mon, 19 Dec 2022 17:59:02 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=97=A5=E6=9C=9F,=E4=BF=9D?= =?UTF-8?q?=E8=B4=A8=E6=9C=9F=E7=9A=84=E4=BF=AE=E6=94=B9,=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=B6=E7=9A=84=E7=89=A9=E8=B5=84=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=98=BE=E7=A4=BA=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ProcessMaterialsAllotForm.vue | 18 ++++++++++++++++++ .../form/ProcessMaterialsDeliveryForm.vue | 18 ++++++++++++++++++ .../activiti/form/ProcessUdgetPlanForm.vue | 8 +++++--- .../ProcessMaterialWarehousingListList.vue | 2 +- .../ProcessMaterialsDeliveryListList.vue | 2 +- .../ProcessMaterialWarehousingListModal.vue | 6 +++--- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/views/activiti/form/ProcessMaterialsAllotForm.vue b/src/views/activiti/form/ProcessMaterialsAllotForm.vue index 1dc8e31..f9356fd 100644 --- a/src/views/activiti/form/ProcessMaterialsAllotForm.vue +++ b/src/views/activiti/form/ProcessMaterialsAllotForm.vue @@ -279,6 +279,24 @@ disabled: this.disabled, defaultValue: '' }, + { + title: '生产日期', + key: 'productionTime', + type: FormTypes.date, + width: '200px', + placeholder: '请输入${title}', + disabled: this.disabled, + defaultValue: '' + }, + { + title: '保质期', + key: 'expirationDate', + type: FormTypes.inputNumber, + width: '200px', + placeholder: '请输入${title}', + disabled: this.disabled, + defaultValue: '' + }, { title: '供货商', key: 'supplierId', diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue index ec02e44..9ef3306 100644 --- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue +++ b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue @@ -306,6 +306,24 @@ defaultValue: '', disabled: true }, + { + title: '生产日期', + key: 'productionTime', + type: FormTypes.date, + width: '200px', + placeholder: '请输入${title}', + disabled: this.disabled, + defaultValue: '' + }, + { + title: '保质期', + key: 'expirationDate', + type: FormTypes.inputNumber, + width: '200px', + placeholder: '请输入${title}', + disabled: this.disabled, + defaultValue: '' + }, { title: '用途', key: 'purpose', diff --git a/src/views/activiti/form/ProcessUdgetPlanForm.vue b/src/views/activiti/form/ProcessUdgetPlanForm.vue index 1d9a93e..2cc57e9 100644 --- a/src/views/activiti/form/ProcessUdgetPlanForm.vue +++ b/src/views/activiti/form/ProcessUdgetPlanForm.vue @@ -508,7 +508,7 @@ materialType: { rules: [{ required: true, message: '请选择物资类型!' }] }, needTime: { rules: [{ required: true, message: '请选择需求时间!' }] }, processPlan: { rules: [{ required: true, message: '请选择流程计划!' }] }, - sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个字符)'}, + sort: { rules: [{ required: true, type:'number', max:999999999999, message: '请输入序号!(0 ~ 12个数字)'}, // { type:'number', max:999999999999, message: '长度在 0 到 12 个字符'} // {validator: this.lengthCheck} ] @@ -601,6 +601,8 @@ // userInfo.company=company; if (!this.isNew) { this.init() + // this.isSourceCapital=true; + // this.isPlanType=true; }else { this.popupCallback(company, userInfo) } @@ -1081,7 +1083,7 @@ id: r.tableId }).then((res) => { if (res.success) { - this.planType = res.result.planType + // this.planType = res.result.planType let formData = res.result formData.tableName = r.tableName this.data = formData @@ -1357,7 +1359,7 @@ formData.procDefId = this.processData.id formData.procDeTitle = this.processData.name formData.title = this.processData.description - formData.planType=this.planType; + // formData.planType=this.planType; if (!formData.tableName) formData.tableName = this.processData.businessTable var url = this.url.add let method = 'post' diff --git a/src/views/processmaterials/ProcessMaterialWarehousingListList.vue b/src/views/processmaterials/ProcessMaterialWarehousingListList.vue index 2060651..8d429d6 100644 --- a/src/views/processmaterials/ProcessMaterialWarehousingListList.vue +++ b/src/views/processmaterials/ProcessMaterialWarehousingListList.vue @@ -182,7 +182,7 @@ { title:'WBS', align:"center", - dataIndex: 'wbs_dictText', + dataIndex: 'wbs', }, // { // title:'物料名称及规格型号', diff --git a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue index f7f107f..e2ab575 100644 --- a/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue +++ b/src/views/processmaterials/ProcessMaterialsDeliveryListList.vue @@ -146,7 +146,7 @@ { title:'WBS', align:"center", - dataIndex: 'wbs_dictText', + dataIndex: 'wbs', }, { title:'物料名称及规格型号', diff --git a/src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue b/src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue index 0d81c97..6ac817e 100644 --- a/src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue +++ b/src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue @@ -113,7 +113,7 @@ - + @@ -186,7 +186,7 @@ this.model = Object.assign({}, record); this.visible = true; this.$nextTick(() => { - this.form.setFieldsValue(pick(this.model,'materialGroup','materialNumber','materialDescription','unitWasteWarehouseCodeId','productionTime','expirationDate','arrivalNotice','storageTime','librarySign','accountingAttributes','equipment','wbs','materialName','materialUnit','materialPrice','materialAmount','supplier','supplierBatch','warehousingTime','purpose','processMaterialWarehousingId','commodityId','commodityDetailsId','warehouseId','supplierId','defFlag','delTime')) + this.form.setFieldsValue(pick(this.model,'materialGroup','materialNumber','materialDescription','unitWasteWarehouseCodeId','productionTime','expirationDate','arrivalNotice','storageTime','librarySign','accountingAttributes','equipment','wbs','materialName','materialUnit','materialPrice','materialAmount','supplier','supplierBatch','warehousingTime','purpose','processMaterialWarehousingId','commodityId','commodityDetailsId','warehouseId','supplierId','delFlag','delTime')) }) }, close () { @@ -230,7 +230,7 @@ this.close() }, popupCallback(row){ - this.form.setFieldsValue(pick(row,'materialGroup','materialNumber','materialDescription','unitWasteWarehouseCodeId','productionTime','expirationDate','arrivalNotice','storageTime','librarySign','accountingAttributes','equipment','wbs','materialName','materialUnit','materialPrice','materialAmount','supplier','supplierBatch','warehousingTime','purpose','processMaterialWarehousingId','commodityId','commodityDetailsId','warehouseId','supplierId','defFlag','delTime')) + this.form.setFieldsValue(pick(row,'materialGroup','materialNumber','materialDescription','unitWasteWarehouseCodeId','productionTime','expirationDate','arrivalNotice','storageTime','librarySign','accountingAttributes','equipment','wbs','materialName','materialUnit','materialPrice','materialAmount','supplier','supplierBatch','warehousingTime','purpose','processMaterialWarehousingId','commodityId','commodityDetailsId','warehouseId','supplierId','delFlag','delTime')) },