Merge branch 'greenUrgent' into allTestUrgent

src/HDrpManagement/serveBill/modules/detail.vue

@@ -43,7 +43,7 @@
           :id="$route.query.id"
           :paramData="[{ key: 'issumbit', value: 1 }]"
           @onSuccess="queryMainData"
-          :disabled="(hrid == 0 && usertype == 0) || submitDis"
+          :disabled="(hrid == 0 && usertype == 0) && submitDis"
           class="inline-16"
           v-if="
             mainData.status == '新建' && tool.checkAuth($route.name, 'submit')