first

src/typings/plan.d.ts

@@ -6,6 +6,7 @@ declare namespace planWorkOrder {
     total: number;
     orderType: number | null;
     model: string;
+		orderCode?: string;
     workorderCode: string;
     productSpecification: string;
   }

src/views/device/facilityKnowledgeBase/index.vue

@@ -235,12 +235,12 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
       tooltip: true
     }
   },
-  {
-    title: '审批人',
-    align: 'center',
-    key: 'approveBy',
-    width: 100
-  },
+  // {
+  //   title: '审批人',
+  //   align: 'center',
+  //   key: 'approveBy',
+  //   width: 100
+  // },
   {
     title: '操作',
     align: 'center',

src/views/device/repairForm/index.vue

@@ -17,18 +17,18 @@
         <n-form-item label="报修时间">
           <n-date-picker v-model:value="range" type="datetimerange" clearable />
         </n-form-item>
-        <n-form-item label="状态">
-          <n-select
-            v-model:value="searchForm.status"
-            class="w-180px"
-            :options="[
-              { label: '全部', value: '' },
-              { label: '维修中', value: '0' },
-              { label: '审批中', value: '1' },
-              { label: '已完成', value: '2' }
-            ]"
-          ></n-select>
-        </n-form-item>
+<!--        <n-form-item label="状态">-->
+<!--          <n-select-->
+<!--            v-model:value="searchForm.status"-->
+<!--            class="w-180px"-->
+<!--            :options="[-->
+<!--              { label: '全部', value: '' },-->
+<!--              { label: '维修中', value: '0' },-->
+<!--              { label: '审批中', value: '1' },-->
+<!--              { label: '已完成', value: '2' }-->
+<!--            ]"-->
+<!--          ></n-select>-->
+<!--        </n-form-item>-->
         <n-form-item>
           <component
             :is="
@@ -380,34 +380,34 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
       tooltip: true
     }
   },
-  {
-    title: '维修时长',
-    align: 'center',
-    width: 180,
-    key: 'maintainTime',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '审批人',
-    align: 'center',
-    width: 100,
-    key: 'approveBy'
-  },
-  {
-    title: '审批时间',
-    align: 'center',
-    width: 180,
-    key: 'approveTime',
-    render: row => (row.approveTime ? formatDate(new Date(row.approveTime), 'yyyy-MM-dd hh:mm:ss') : '')
-  },
-  {
-    title: '审批结论',
-    align: 'center',
-    width: 180,
-    key: 'attr1'
-  },
+  // {
+  //   title: '维修时长',
+  //   align: 'center',
+  //   width: 180,
+  //   key: 'maintainTime',
+  //   ellipsis: {
+  //     tooltip: true
+  //   }
+  // },
+  // {
+  //   title: '审批人',
+  //   align: 'center',
+  //   width: 100,
+  //   key: 'approveBy'
+  // },
+  // {
+  //   title: '审批时间',
+  //   align: 'center',
+  //   width: 180,
+  //   key: 'approveTime',
+  //   render: row => (row.approveTime ? formatDate(new Date(row.approveTime), 'yyyy-MM-dd hh:mm:ss') : '')
+  // },
+  // {
+  //   title: '审批结论',
+  //   align: 'center',
+  //   width: 180,
+  //   key: 'attr1'
+  // },
   {
     title: '状态',
     align: 'center',

src/views/plan/produceOrder/index.vue

@@ -45,6 +45,9 @@
 				<n-form-item label="产品型号">
 					<n-input v-model:value="searchForm.model" type="text" placeholder="请输入产品型号" />
 				</n-form-item>
+				<n-form-item label="订单编号">
+					<n-input v-model:value="searchForm.orderCode" type="text" placeholder="请输入订单编号" />
+				</n-form-item>
 				<n-form-item label="规格">
 					<n-input v-model:value="searchForm.productSpecification" type="text" placeholder="请输入规格" />
 				</n-form-item>
@@ -352,6 +355,7 @@ const searchForm = ref<planWorkOrder.searchForm>({
 	pageSize: 10,
 	total: 0,
 	orderType: null,
+	orderCode: '',
 	model: '',
 	workorderCode: '',
 	productSpecification: ''

src/views/produce/workOrderArrange/index.vue

@@ -134,7 +134,7 @@ import {
 import { getStatusName } from '~/src/utils/common/workOrder';
 import { formatDate } from '~/src/utils/form/rule';
 const { loading, startLoading, endLoading } = useLoading();
-const title = ref<string>('金属眼镜工单-所有');
+const title = ref<string>('生产工单');
 const router = useRouter();
 // 工单状态
 const workOrderStatusList = ref<{ label: string; value: number | undefined }[]>([

src/views/sale/saleOrder/index.vue

@@ -557,7 +557,7 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
 				'2': { label: '已排产', type: 'success' },
 				'3': { label: '生产中', type: 'warning' },
 				'4': { label: '已完成', type: 'success' },
-				'5': { label: '已发货', type: 'success' },
+				'5': { label: '已作废', type: 'error' },
 				'6': { label: '已驳回', type: 'error' },
 				'8': { label: '申请发货中', type: 'primary' },
 				'9': { label: '已通过待发货', type: 'success' },
@@ -652,7 +652,7 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
 				)
 			}
 
-			if(row.status === '4' || row.status === '5'){
+			if(row.status === '4'){
 				actions.push(
 					<n-button size="small" type="primary" onClick={() => handleSend(row)}>申请发货
 					</n-button>