生产日期,保质期的修改,出入库时的物资类型显示等

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',

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',

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'

src/views/processmaterials/ProcessMaterialWarehousingListList.vue

@@ -182,7 +182,7 @@
           {
             title:'WBS',
             align:"center",
-            dataIndex: 'wbs_dictText',
+            dataIndex: 'wbs',
           },
           // {
           //   title:'物料名称及规格型号',

src/views/processmaterials/ProcessMaterialsDeliveryListList.vue

@@ -146,7 +146,7 @@
           {
             title:'WBS',
             align:"center",
-            dataIndex: 'wbs_dictText',
+            dataIndex: 'wbs',
           },
           {
             title:'物料名称及规格型号',

src/views/processmaterials/modules/ProcessMaterialWarehousingListModal.vue

@@ -113,7 +113,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-item label="删除标志" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input-number v-decorator="['defFlag']" placeholder="请输入删除标志" style="width: 100%" />
+              <a-input-number v-decorator="['delFlag']" placeholder="请输入删除标志" style="width: 100%" />
             </a-form-item>
           </a-col>
           <a-col :span="24">
@@ -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'))
       },