浏览代码

reactor:省工单退回条件判断;

zhangchong 6 月之前
父节点
当前提交
0f976b85b7
共有 3 个文件被更改,包括 14 次插入8 次删除
  1. 5 1
      src/views/business/order/copy-index.vue
  2. 4 6
      src/views/business/order/index.vue
  3. 5 1
      src/views/province/order.vue

+ 5 - 1
src/views/business/order/copy-index.vue

@@ -106,7 +106,11 @@
 						@click="onReturn(row)"
 						title="省工单退回"
 						v-auth="'business:order:return:province'"
-						v-if="row.isProvince && (row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !==  '' || row.status === 0) && row.status < 300 && row.status !== 9"
+						v-if="
+								row.isProvince &&
+								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode === null || row.actualHandleOrgCode === '' || row.status === 0) &&
+								row.status < 300 && row.status !== 9 && !row.provinceSendBack
+							"
 					>
 						退回</el-button
 					>

+ 4 - 6
src/views/business/order/index.vue

@@ -100,9 +100,8 @@
 							v-auth="'business:order:return:province'"
 							v-if="
 								row.isProvince &&
-								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !== '' || row.status === 0) &&
-								row.status < 300 &&
-								row.status !== 9
+								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode === null || row.actualHandleOrgCode === '' || row.status === 0) &&
+								row.status < 300 && row.status !== 9 && !row.provinceSendBack
 							"
 						>
 							退回</el-button
@@ -215,9 +214,8 @@
 							v-auth="'business:order:return:province'"
 							v-if="
 								row.isProvince &&
-								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !== '' || row.status === 0) &&
-								row.status < 300 &&
-								row.status !== 9
+								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode === null || row.actualHandleOrgCode === '' || row.status === 0) &&
+								row.status < 300 && row.status !== 9 && !row.provinceSendBack
 							"
 						>
 							退回</el-button

+ 5 - 1
src/views/province/order.vue

@@ -56,7 +56,11 @@
 						@click="onReturn(row)"
 						title="省工单退回"
 						v-auth="'province:order:return'"
-						v-if="row.isProvince && (row.actualHandleOrgCode === '001' || row.actualHandleOrgCode !== null || row.actualHandleOrgCode !==  '' || row.status === 0) && row.status < 300 && row.status !== 9"
+						v-if="
+								row.isProvince &&
+								(row.actualHandleOrgCode === '001' || row.actualHandleOrgCode === null || row.actualHandleOrgCode === '' || row.status === 0) &&
+								row.status < 300 && row.status !== 9 && !row.provinceSendBack
+							"
 					>
 						退回</el-button
 					>