页面显示

src/views/activiti/ProcessModelList.vue

@@ -758,6 +758,7 @@
         // this.loadData();
       },
       loadData(arg) {
+
         if(!this.url.list){
           this.$message.error("请设置url.list属性!")
           return

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -649,8 +649,9 @@
                 httpAction(url, formData, method).then((res) => {
                   if (res.success) {
                     //todo 将表单的数据传给父组件
-                    this.$emit('afterSubmit', formData)
-                    this.$emit("close")
+                    if(e!=true){
+                      this.$emit('afterSubmit', formData)
+                    }
                   } else {
                     this.$message.error(res.message)
                   }
@@ -768,7 +769,7 @@
       },
       saveAndpassTask() {
         this.passTask()
-        this.handleSubmit();
+        this.handleSubmit(true);
       },
       validateError(msg) {
         this.$message.error(msg)

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1350,7 +1350,7 @@
               return
             } else {
               this.passTask();
-              this.handleSubmit();
+              this.handleSubmit(true);
             }
           }
         })
@@ -1413,8 +1413,9 @@
                 httpAction(url, formData, method).then((res) => {
                   if (res.success) {
                     //todo 将表单的数据传给父组件
-                    this.$emit('afterSubmit', formData)
-                    this.$emit("close")
+                    if(e!=true){
+                      this.$emit('afterSubmit', formData)
+                    }
                   } else {
                     this.$message.error(res.message)
                   }

src/views/suppliesstronger/ProcessSuppliesStrongerLists.vue

@@ -26,7 +26,7 @@
             </a-col>
             <a-col :xl="4" :lg="7" :md="8" :sm="16">
               <a-form-item label="仓储地点">
-                <a-input placeholder="请选择仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
+                <a-input placeholder="请输入仓储地点" v-model="queryParam.unitWasteWarehouseCodeId"/>
               </a-form-item>
             </a-col>
           <a-col :xl="5" :lg="7" :md="8" :sm="16">
@@ -73,7 +73,7 @@
         <a-row :gutter="24">
           <a-col :xl="5" :lg="7" :md="8" :sm="16">
             <a-form-item label="入库批次">
-              <a-input placeholder="请选择批次" v-model="queryParam.supplierBatch"/>
+              <a-input placeholder="请输入批次" v-model="queryParam.supplierBatch"/>
             </a-form-item>
           </a-col>
 

src/views/wastematerials/ProcessWasteMaterialsLists.vue

@@ -47,7 +47,7 @@
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">
               <a-form-item label="保质期">
-                <a-input placeholder="请选择保质期" v-model="queryParam.expirationDate"></a-input>
+                <a-input placeholder="请输入保质期" v-model="queryParam.expirationDate"></a-input>
               </a-form-item>
             </a-col>
             <a-col :xl="6" :lg="7" :md="8" :sm="24">