Merge branch 'dev' into test

src/constants/index.ts

@@ -565,6 +565,7 @@ export enum DeliverySideState {
 // 采购订单外部显示文案
 export const PurchaseOrderOutWorkStateTexts = {
   "-1": "取消订单",
+  0: '完成订单',
   1: '提交订单',
   2: '确认订单',
   3: '确认电子合同',
@@ -636,6 +637,7 @@ export const SaleOrderInsideWorkStateTexts = {
 // 订单流转记录外部状态
 export const OrderTransformOutWorkStateTexts = {
   "-1": '取消订单',
+  0: '完成订单',
   1: '待确认',
   2: '待确认电子合同',
   3: '待支付',
@@ -659,6 +661,7 @@ export const OrderTransformOutWorkStateTexts = {
 // 采购订单流转记录内部状态
 export const PurchaseOrderTransformInsideWorkStateTexts = {
   "-1": '取消订单',
+  0: '完成订单',
   1: '待提交审核',
   2: '提交审核通过',
   3: '审核通过',

src/pages/orderSystem/orderDetail/index.tsx

@@ -59,7 +59,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
     { label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
-    { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
+    // { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
   ]
   const headerTiTle = formData ? {
     picName: '单',

src/pages/orderSystem/readyConfirmPayList/detail.tsx

@@ -72,7 +72,7 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
     { label: '订单类型', name: 'type', span: 8, render: text => orderTypeLabel[text] },
     { label: '下单时间', name: 'createTime', span: 8, render: text => formatTimeString(text) },
     { label: '外部状态', name: 'externalState', span: 8, render: text => <StatusColors type='out' status={text}/> },
-    { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
+    // { label: '内部状态', name: 'purchaseOrderInteriorState', span: 8, render: text => <StatusColors type='saleInside' status={text}/> },
   ]
   const headerTiTle = formData ? {
     picName: '单',