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

# Conflicts:
#	src/views/activiti/form/ProcessUdgetPlanForm.vue

src/views/activiti/form/ProcessMaterialBorrowingForm.vue

@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -86,7 +86,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
@@ -457,7 +457,7 @@
               {
                 rowKey: record.row.id,
                 values: {
-                  'materialAmount': record.row.materialPrice * record.row.materialQuantity
+                  'materialAmount': parseFloat((record.row.materialPrice * record.row.materialQuantity).toFixed(1)),
                 }
               }
             ]

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -55,7 +55,7 @@
           </a-col>
           <a-col :span="8
 ">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>
@@ -586,7 +586,7 @@
                   // 'materialPrice': res.price,
                   // 'number': res.number,
                   'allotNumber': res.allotNumber,
-                  'materialAmount': res.materialPrice * parseInt(res.allotNumber)
+                  'materialAmount':   parseFloat((res.materialPrice * parseInt(res.allotNumber)).toFixed(1)),
                 }
               }
             ]

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -61,7 +61,7 @@
             </a-form-item>
           </a-col>-->
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>

src/views/activiti/form/ProcessMaterialsReturnForm.vue

@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>

src/views/activiti/form/ProcessPermissionAuthorizationForm.vue

@@ -69,7 +69,7 @@
 <!--            </a-form-item>-->
 <!--          </a-col>-->
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>

src/views/activiti/form/ProcessSmaterialsScrapForm.vue

@@ -42,7 +42,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8">
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"></j-upload>
             </a-form-item>
           </a-col>

src/views/activiti/form/ProcessSpecialMaterialsForm.vue

@@ -40,7 +40,7 @@
             </a-form-item>
           </a-col>
           <a-col :span="8" >
-            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3">
+            <a-form-item label="文件" :labelCol="labelCol3" :wrapperCol="wrapperCol3" style="z-index: 10000">
               <j-upload v-decorator="['fileId']" :trigger-change="true"  ></j-upload>
             </a-form-item>
           </a-col>

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1,7 +1,7 @@
 <template>
 
   <a-spin :spinning="confirmLoading" style="height: 680px;padding-top: 10px">
-    <j-form-container :disabled="formDisabled" style="background-color: #efefef;padding-top: 10px">
+    <j-form-container :disabled="formDisabled" style="background-color: #efefef;padding-top: 10px" >
       <!-- 主表单区域 -->
       <a-form :form="form" slot="detail">
         <a-row>
@@ -1033,7 +1033,7 @@
                   'materialSeries': record.row.materialSeries,
                   'materialName': record.row.materialName,
                   'materialUnit': record.row.materialUnit,
-                  'materialAmount': record.row.materialQuantity * record.row.materialPrice,
+                  'materialAmount': parseFloat((record.row.materialQuantity * record.row.materialPrice).toFixed(1)),
                   'materialType': this.data.materialType
                 }
               }

src/views/activiti/todoManage.vue

@@ -472,6 +472,8 @@
             }
           })
         }
+        this.form.comment=null;
+        this.form.userId=null;
       },
       async detail(r) {
         if (!r.routeName) {