Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/Form/projectTask/add.vue

@@ -321,7 +321,10 @@
             }
             this.optionscore=[]
             this.partiesType=[]
-            this.projectStage=[]
+            // this.projectStage=[]
+            this.objects = []
+            this.optionscore= []
+            this.stages = new Map()
             this.drawer = false
             this.act_projtask = null
             this.$refs.onparties.$refs.customerType.$refs.tables.clearSelection()
@@ -344,10 +347,13 @@
         }
         this.optionscore=[]
         this.partiesType=[]
-        this.projectStage=[]
+        this.objects = []
+        this.projectStage = []
         this.act_projtask = null
         this.relateForm = []
-        /*this.$refs.onparties.$refs.projectType.$refs.tables.clearSelection()*/
+        this.stages = new Map()
+        this.$refs.onparties.$refs.customerType.$refs.tables.clearSelection()
+        this.$refs.onparties.$refs.projectType.$refs.tables.clearSelection()
 
       }
     }

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -65,7 +65,7 @@
           <el-input-number 
             :controls="true" controls-position='right' 
             :step-strictly="true" v-if="data.status === '新建'" 
-            size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.undeliqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
+            size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="qtyChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>