first

src/typings/produce.d.ts

@@ -6,6 +6,7 @@ declare namespace workOrderArrange {
     pageSize: number;
     total: number;
     wiredrawingCode: string;
+    orderCode?: string;
     specification: string;
     equipmentCode: string;
     enamellingCode: string;

src/views/produce/workOrderArrange/index.vue

@@ -66,6 +66,9 @@
         <n-form-item label="机台名称">
           <n-input v-model:value="searchForm.equipmentCode" 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>
     </my-card>
     <my-card v-show="workOrderTypeValue === 0" :title="title">
@@ -154,6 +157,7 @@ const searchForm = ref<workOrderArrange.searchForm>({
   total: 0,
   workOrderType: 1,
   wiredrawingCode: '',
+  orderCode: '',
   specification: '',
   equipmentCode: '',
   enamellingCode: ''
@@ -241,15 +245,15 @@ const lsColumns: Ref<DataTableColumns<workOrderArrange.lsTabelList>> = ref([
       tooltip: true
     }
   },
-  {
+	{
-    title: '开始机台',
+		title: '订单编号',
-    align: 'center',
+		align: 'center',
-    width: 160,
+		width: 160,
-    key: 'equipmentCode',
+		key: 'orderCode',
-    ellipsis: {
+		ellipsis: {
-      tooltip: true
+			tooltip: true
-    }
+		}
-  },
+	},
   {
     title: '产品型号',
     align: 'center',
@@ -415,6 +419,15 @@ const qbColumns: Ref<DataTableColumns<workOrderArrange.qbTabelList>> = ref([
       tooltip: true
     }
   },
+	{
+		title: '订单编号',
+		align: 'center',
+		width: 160,
+		key: 'orderCode',
+		ellipsis: {
+			tooltip: true
+		}
+	},
   // {
   //   title: '结束机台',
   //   align: 'center',
@@ -581,6 +594,7 @@ function reset(): void {
     pageNum: 1,
     pageSize: 10,
     total: 0,
+		orderCode: '',
     workOrderType: 0,
     wiredrawingCode: '',
     specification: '',

src/views/sale/saleOrder/index.vue

@@ -557,10 +557,13 @@ 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: 'success' },
+				'6': { label: '已驳回', type: 'error' },
 				'8': { label: '申请发货中', type: 'primary' },
-				'9': { label: '已发货', type: 'success' },
+				'9': { label: '已通过待发货', type: 'success' },
-				'6': { label: '已驳回', type: 'error' }
+				'10': { label: '发货申请未通过', type: 'error' },
+				'11': { label: '出库中', type: 'success' },
+				'12': { label: '已发货', type: 'success' }
 			};
 			const { label, type } = statusMap[row.status || '0'];
 			return <NTag type={type}>{label}</NTag>;
@@ -597,6 +600,7 @@ const columns: Ref<DataTableColumns<DataType>> = ref([
 		title: '操作',
 		align: 'center',
 		key: 'actions',
+		fixed: 'right',
 		width: 220,
 		render: row => {
 			const actions:any[] = [];
@@ -748,7 +752,7 @@ const workorderHandleCancel = () => {
 function handleSend(row){
 	return dialog.warning({
 		title: '提示',
-		content:"申请后需仓管审核后发货，确认申请发货？",
+		content:"申请后需仓管审核后发货，确认申请？",
 		style: {
 			borderRadius: '10px'
 		},
@@ -759,7 +763,7 @@ function handleSend(row){
 			console.log(1);
 		},
 		onPositiveClick: () => {
-			editSaleOrder({id: row.id, status: '8'}).then((res: any) => {
+			editSaleOrder({id: row.id, status: '8', attr1:'send'}).then((res: any) => {
 				if (res.code === 200) {
 					message.success('申请成功');
 					init();

src/views/system/log/login/index.vue

@@ -200,11 +200,11 @@ const columns: Ref<DataTableColumns<LoginManagement.LoginType>> = ref([
     align: 'center'
   },
 
-  {
+  // {
-    title: '地址',
+  //   title: '地址',
-    key: 'ipaddr',
+  //   key: 'ipaddr',
-    align: 'center'
+  //   align: 'center'
-  },
+  // },
 
   {
     title: '描述',

src/views/system/log/operate/index.vue

@@ -275,12 +275,12 @@ const columns: Ref<DataTableColumns<OperaManagement.OperaType>> = ref([
     align: 'center',
     width: 100
   },
-  {
+  // {
-    title: '主机',
+  //   title: '主机',
-    key: 'operIp',
+  //   key: 'operIp',
-    align: 'center',
+  //   align: 'center',
-    width: 140
+  //   width: 140
-  },
+  // },
   {
     title: '操作状态',
     key: 'status',

src/views/system/user/index.vue

@@ -281,12 +281,12 @@ const columns: Ref<DataTableColumns<UserManagement.User>> = ref([
     align: 'center',
     width: 60
   },
-  {
+  // {
-    title: '用户编号',
+  //   title: '用户编号',
-    key: 'id',
+  //   key: 'id',
-    align: 'center',
+  //   align: 'center',
-    width: 120
+  //   width: 120
-  },
+  // },
   {
     title: '用户名称',
     key: 'name',