Merge branch 'master' into 测试

src/views/group/order/management/detail.vue

@@ -101,7 +101,7 @@
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">快递包材费: </span>
                             <span>{{ item.deliveryMaterialsFee }}</span>
-                            <el-tooltip content="修改快递包材费" placement="top" effect="light">
+                            <el-tooltip content="修改快递包材费" placement="top" effect="light" v-if="userStatus">
                               <el-icon
                                 style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
                                 @click="clickChangePrice(item, index, 'deliveryMaterialsFee', '快递包材费')"
@@ -109,7 +109,7 @@
                                 <EditPen />
                               </el-icon>
                             </el-tooltip>
-                            <el-tooltip content="清零" placement="top" effect="light">
+                            <el-tooltip content="清零" placement="top" effect="light" v-if="userStatus">
                               <el-icon
                                 style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
                                 @click="clickRefresh(index, 'deliveryMaterialsFee')"
@@ -121,7 +121,7 @@
                           <div style="line-height: 35px">
                             <span style="color: black; font-weight: 700">包装人工费: </span>
                             <span>{{ item.packingLabor }}</span>
-                            <el-tooltip content="修改包装人工费" placement="top" effect="light" v-if="userStatus">
+                            <el-tooltip content="修改包装人工费" placement="top" effect="light">
                               <el-icon
                                 style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
                                 @click="clickChangePrice(item, index, 'packingLabor', '包装人工费')"
@@ -129,7 +129,7 @@
                                 <EditPen />
                               </el-icon>
                             </el-tooltip>
-                            <el-tooltip content="清零" placement="top" effect="light" v-if="userStatus">
+                            <el-tooltip content="清零" placement="top" effect="light">
                               <el-icon
                                 style="margin-left: 10px; transform: translateY(2px); color: #409eff; cursor: pointer"
                                 @click="clickRefresh(index, 'packingLabor')"
@@ -402,7 +402,7 @@
             style="width: 100%"
             :controls="false"
             :min="0"
-            :precision="2"
+            :precision="labelPrice === 'deliveryMaterialsFee' ? 3 : 2"
             :disabled="(!changePrice.data.customProcessingType || changePrice.data.customProcessingType === '-1') && labelPrice === 'customProcessingFee'" />
         </el-form-item>
       </el-form>
@@ -411,7 +411,7 @@
         <el-button type="primary" @click="submitChangePrice()" size="large" v-preReClick>提 交</el-button>
       </template>
     </el-dialog>
-    
+
     <el-dialog title="包装配置" v-if="openViewPackaging" v-model="openViewPackaging" width="80%">
       <div style="height: calc(100vh - 184px); overflow-y: auto; overflow-x: hidden">
         <div style="font-weight: 700; margin: 20px 0 10px 0">发货包装</div>