From 3cb9ce0a964441a816579f3a06dbc041d1e59744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=99=AE=E5=BB=BA?= <450837357@qq.com>
Date: Wed, 11 Jun 2025 09:54:55 +0800
Subject: [PATCH] first

---
 src/typings/produce.d.ts                     |    1 +
 src/views/produce/workOrderArrange/index.vue |   32 +-
 src/views/sale/saleOrder/index.vue           |   14 +-
 src/views/storage/rawMaterial/index.vue      | 1557 ++++++++++--------
 src/views/system/log/login/index.vue         |   10 +-
 src/views/system/log/operate/index.vue       |   12 +-
 src/views/system/user/index.vue              |   12 +-
 7 files changed, 928 insertions(+), 710 deletions(-)

diff --git a/src/typings/produce.d.ts b/src/typings/produce.d.ts
index 19ac9bf..2a466f7 100644
--- a/src/typings/produce.d.ts
+++ b/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;
diff --git a/src/views/produce/workOrderArrange/index.vue b/src/views/produce/workOrderArrange/index.vue
index 5769b7d..e72654b 100644
--- a/src/views/produce/workOrderArrange/index.vue
+++ b/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: '开始机台',
-    align: 'center',
-    width: 160,
-    key: 'equipmentCode',
-    ellipsis: {
-      tooltip: true
-    }
-  },
+	{
+		title: '订单编号',
+		align: 'center',
+		width: 160,
+		key: 'orderCode',
+		ellipsis: {
+			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: '',
diff --git a/src/views/sale/saleOrder/index.vue b/src/views/sale/saleOrder/index.vue
index fc687ff..46604c5 100644
--- a/src/views/sale/saleOrder/index.vue
+++ b/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' },
-				'6': { label: '已驳回', type: 'error' }
+				'9': { label: '已通过待发货', type: 'success' },
+				'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();
diff --git a/src/views/storage/rawMaterial/index.vue b/src/views/storage/rawMaterial/index.vue
index d6db429..0131dd5 100644
--- a/src/views/storage/rawMaterial/index.vue
+++ b/src/views/storage/rawMaterial/index.vue
@@ -1,730 +1,929 @@
 <template>
-  <div>
-    <my-card title="搜索条件" search>
-      <n-form inline style="flex-wrap: wrap">
-        <n-form-item label="时间">
-          <n-date-picker v-model:value="range" type="datetimerange" clearable />
-        </n-form-item>
-        <!-- <n-form-item label="日期">
-          <n-date-picker v-model:formatted-value="forModel.inDate" type="datetime" :style="{ width: formItemWidth }" />
-        </n-form-item> -->
-        <n-form-item label="出入库类型">
-          <n-select
-            v-model:value="searchForm.status"
-            :options="options"
-            placeholder="请选择出入库类型"
-            :style="{ width: formItemWidth }"
-          ></n-select>
-        </n-form-item>
-        <n-form-item label="贸易商" path="ingredientsId">
-          <n-select
-            v-model:value="searchForm.ingredientsId"
-            placeholder="请选择贸易商"
-            :filterable="true"
-            :options="merchantList"
-            :style="{ width: formItemWidth }"
-          ></n-select>
-        </n-form-item>
-        <n-form-item label="品名" path="productId">
-          <n-select
-            v-model:value="searchForm.productId"
-            :style="{ width: formItemWidth }"
-            placeholder="选择品名"
-            :filterable="true"
-            :options="productNameList"
-          ></n-select>
-        </n-form-item>
-        <n-form-item label="规格" path="itemId">
-          <n-select
-            v-model:value="searchForm.itemId"
-            placeholder="选择规格"
-            :filterable="true"
-            :options="specificationList"
-            :style="{ width: formItemWidth }"
-          ></n-select>
-        </n-form-item>
-        <n-form-item label="二维码编号">
-          <n-input
-            v-model:value="searchForm.codeSn"
-            placeholder="请输入二维码编号"
-            :style="{ width: formItemWidth }"
-          ></n-input>
-        </n-form-item>
-        <n-form-item label="批号">
-          <n-input
-            v-model:value="searchForm.lotNumber"
-            placeholder="请输入批号"
-            :style="{ width: formItemWidth }"
-          ></n-input>
-        </n-form-item>
-        <!-- <n-form-item label="合计件数">
-          <n-input v-model:value="totalNumber" :disabled="true" :style="{ width: formItemWidth }"></n-input>
-        </n-form-item>
-        <n-form-item label="合计净重">
-          <n-input v-model:value="netWeight" :disabled="true" :style="{ width: formItemWidth }"></n-input>
-        </n-form-item>
-        <n-form-item label="合计皮重">
-          <n-input v-model:value="tareNumber" :disabled="true" :style="{ width: formItemWidth }"></n-input>
-        </n-form-item> -->
-        <n-form-item>
-          <component
-            :is="
+	<div>
+		<my-card title="搜索条件" search>
+			<n-form inline>
+				<n-form-item label="订单类型">
+					<n-select
+						v-model:value="searchForm.orderType"
+						class="w-180px"
+						placeholder="请选择订单类型"
+						:options="typeOption"
+						clearable
+					/>
+				</n-form-item>
+				<n-form-item label="订单编号">
+					<n-input v-model:value="searchForm.orderCode" placeholder="请输入订单编号"></n-input>
+				</n-form-item>
+				<n-form-item>
+					<component
+						:is="
               useSearchBtn(
                 () => {
-                  search();
+                  handleSearch();
                 },
                 () => {
-                  reset();
+                  handleReset();
                 }
               )
             "
-          />
-        </n-form-item>
-      </n-form>
-    </my-card>
-    <my-card :title="title">
-      <template #right>
-        <div style="display: flex">
-          <!-- <n-button type="info" size="small" style="margin-right: 10px" @click="lookReport">查看报表</n-button> -->
-          <!-- <n-button type="error" size="small" style="margin-right: 10px" :disabled="checkedRowKeys.length === 0">
-            批量错误处理
-          </n-button> -->
-          <CxColumns v-model:columns="columns" />
-        </div>
-      </template>
-      <n-data-table
-        v-model:checked-row-keys="checkedRowKeys"
-        :loading="loading"
-        :columns="columns"
-        :data="data"
-        :row-key="rowKey"
-        :max-height="dataTableConfig.maxHeight"
-        :scroll-x="dataTableConfig.scrollWidth(columns)"
-        @update:checked-row-keys="handleCheck"
-      ></n-data-table>
-      <my-pagination v-model:search-form="searchForm" @init="init()"></my-pagination>
-    </my-card>
-
-    <my-dialog v-model:show="editShow" title="编辑" width="800px" @cancel="editShow = false" @submit="submitEdit">
-      <template #content>
-        <div>
-          <n-form
-            ref="formModelRef"
-            style="width: 700px"
-            :model="editFormModel"
-            label-placement="left"
-            label-width="90px"
-            :rules="rules"
-          >
-            <n-grid :cols="2" :x-gap="20">
-              <n-form-item-grid-item label="贸易商" path="ingredientsId">
-                <n-select
-                  v-model:value="editFormModel.ingredientsId"
-                  placeholder="请选择贸易商"
-                  :filterable="true"
-                  :options="merchantList"
-                  :style="{ width: formItemWidth }"
-                  @update-value="(val, item: any) => {
-                    editFormModel.ingredientsName = item.label
-                  }"
-                ></n-select>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="品名" path="productId">
-                <n-select
-                  v-model:value="editFormModel.productId"
-                  :style="{ width: formItemWidth }"
-                  placeholder="选择品名"
-                  :filterable="true"
-                  :options="productNameList"
-                  @update-value="(val, item: any) => {
-                    editFormModel.productName = item.label
-                  }"
-                ></n-select>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="规格" path="itemId">
-                <n-select
-                  v-model:value="editFormModel.itemId"
-                  placeholder="选择规格"
-                  :filterable="true"
-                  :options="specificationList"
-                  :style="{ width: formItemWidth }"
-                  @update-value="(val, item: any) => {
-                    editFormModel.itemSpecification = item.label
-                  }"
-                ></n-select>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="材料厂家" path="manufacturerId">
-                <n-select
-                  v-model:value="editFormModel.manufacturerId"
-                  placeholder="选择材料厂家"
-                  :filterable="true"
-                  :style="{ width: formItemWidth }"
-                  :options="manufacturerList"
-                  @update-value="(val, item: any) => {
-                    editFormModel.manufacturerName = item.label
-
-                  }"
-                ></n-select>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="批号" path="lotNumber">
-                <n-input
-                  v-model:value="editFormModel.lotNumber"
-                  placeholder="请输入批号"
-                  :style="{ width: formItemWidth }"
-                ></n-input>
-              </n-form-item-grid-item>
-              <n-form-item-grid-item label="料号" path="partNumber">
-                <n-input
-                  v-model:value="editFormModel.partNumber"
-                  placeholder="请输入料号"
-                  :style="{ width: formItemWidth }"
-                ></n-input>
-              </n-form-item-grid-item>
-            </n-grid>
-          </n-form>
-        </div>
-      </template>
-    </my-dialog>
-
-    <my-dialog
-      v-model:show="reprintShow"
-      title="补打标签"
-      width="800px"
-      @cancel="reprintShow = false"
-      @submit="submitReprint"
-    >
-      <template #content>
-        <n-form
-          ref="formReprintRef"
-          style="width: 700px"
-          :model="reprintData"
-          label-placement="left"
-          label-width="90px"
-          :rules="reprintRules"
-        >
-          <n-form-item label="补打模板" path="templateType">
-            <n-select
-              v-model:value="reprintData.templateType"
-              placeholder="选择补打模板"
-              :filterable="true"
-              :options="printTypeList"
-            ></n-select>
-          </n-form-item>
-          <n-form-item label="打印原因" path="reason">
-            <n-select
-              v-model:value="reprintData.reasonId"
-              placeholder="选择打印原因"
-              :filterable="true"
-              :options="printCauseList"
-              @update-value="(val, item: any) => {
-                    reprintData.reason = item.label
-                  }"
-            ></n-select>
-          </n-form-item>
-        </n-form>
-      </template>
-    </my-dialog>
-  </div>
+					></component>
+				</n-form-item>
+			</n-form>
+		</my-card>
+		<my-card title="销售出库列表">
+			<template #right>
+				<div>
+					<CxColumns v-model:columns="columns" />
+				</div>
+			</template>
+
+			<n-data-table
+				v-model:checked-row-keys="checkedRowKeys"
+				:data="data"
+				:loading="loading"
+				:row-key="rowKey"
+				:columns="columns"
+				:max-height="dataTableConfig.maxHeight"
+				:scroll-x="dataTableConfig.scrollWidth(columns)"
+				@update-checked-row-keys="handleCheck"
+			></n-data-table>
+			<my-pagination v-model:search-form="searchForm" @init="init"></my-pagination>
+		</my-card>
+		<!-- 审批模态框 -->
+		<!-- 审批模态框 -->
+		<n-modal
+			v-model:show="approveModalVisible"
+			preset="dialog"
+			title="订单明细"
+			class="w-700px h-680px"
+			style="width: 950px; height:760px;"
+			:mask-closable="false"
+			@positive-click="handleApproveSubmit"
+			@negative-click="handleApproveCancel"
+		>
+			<div class="grid grid-cols-2 gap-4">
+				<div class="col-span-2 p-4 bg-gray-50 rounded-lg">
+					<h3 class="text-lg font-semibold mb-3">订单详情</h3>
+					<div class="grid grid-cols-2 gap-4">
+						<div>
+							<p class="text-sm text-gray-500">产品名称</p>
+							<p>{{ currentOrder?.producName || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">产品类型</p>
+							<p>{{ currentOrder?.productTypeName || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">颜色</p>
+							<p>{{ currentOrder?.color || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">订单类型</p>
+							<p>{{ currentOrder?.orderType === '0' ? '客户订单' : '备库订单' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">客户名称</p>
+							<p>{{ currentOrder?.customerName || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">订单编号</p>
+							<p>{{ currentOrder?.orderCode || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">规格型号</p>
+							<p>{{ currentOrder?.specification + '(' + currentOrder?.model + ')' || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">数量</p>
+							<p>{{ currentOrder?.weight || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">单位</p>
+							<p>{{ currentOrder?.measureName || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">交付日期</p>
+							<p>{{ currentOrder?.payTime || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">当前状态</p>
+							<NTag :type=optionsMap[currentOrder.status].type>{{ optionsMap[currentOrder.status].label}}</NTag>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">申请人</p>
+							<p>{{ currentOrder?.applyBy || '-' }}</p>
+						</div>
+						<div>
+							<p class="text-sm text-gray-500">申请时间</p>
+							<p>{{ currentOrder?.applyTime || '-' }}</p>
+						</div>
+						<div v-if="viewType !== 'APPROVE'">
+							<p class="text-sm text-gray-500">审批时间</p>
+							<p>{{ currentOrder?.approveTime || '-' }}</p>
+						</div>
+						<div v-if="viewType !== 'APPROVE'">
+							<p class="text-sm text-gray-500">审批人</p>
+							<p>{{ currentOrder?.approveBy || '-' }}</p>
+						</div>
+						<div v-if="viewType !== 'APPROVE'">
+							<p class="text-sm text-gray-500">审批意见</p>
+							<p>{{ currentOrder?.approveRemark || '-' }}</p>
+						</div>
+					</div>
+				</div>
+
+				<div class="col-span-6 mt-8" style="width: 600px; overflow: auto;" v-if="viewType == 'APPROVE'">
+					<n-form ref="approveFormRef" :model="approveForm" :rules="approveRules">
+						<n-form-item label="审批意见" path="remark" style="width: 100%;">
+							<n-input type="textarea" placeholder="请输入审批意见" v-model:value="approveForm.remark" />
+						</n-form-item>
+					</n-form>
+				</div>
+			</div>
+			<div style="width: 100%;text-align: center;padding: 10px;" v-if="viewType == 'APPROVE'">
+				<n-button @click="handleAudit(currentOrder, 'REJECT')" type="error" style="margin-right: 10px;">
+					驳回
+				</n-button>
+				<n-button @click="handleAudit(currentOrder, 'APPROVE')" type="success">
+					通过
+				</n-button>
+			</div>
+
+			<div style="width: 100%;text-align: center;padding: 10px;" v-if="viewType == 'exceue'">
+				<n-button @click="handleExecute(currentOrder, 'execute')" type="success">
+					确认出库
+				</n-button>
+			</div>
+		</n-modal>
+	</div>
 </template>
 
 <script setup lang="tsx">
-defineOptions({
-  name: 'RawMaterial'
-});
 import type { Ref } from 'vue';
-import { ref, onMounted } from 'vue';
-import type { DataTableColumns, FormInst } from 'naive-ui';
-import { useMessage, useDialog } from 'naive-ui';
-import { createRequiredFormRule, localStg } from '@/utils';
-import { useSocketStore } from '@/store/modules/socket/index';
-import { getMaterialList } from '@/service/api/md/itemlist/index';
-import { getIngredientsTradersList } from '@/service/api/md/ingredients/traders';
-import { getIngredientsProductNameList } from '@/service/api/md/ingredients/productName';
-import { getIngredientsManufacturerList } from '@/service/api/md/ingredients/manufacturer';
-import { getDictDataList } from '@/service/api/system/dictData';
+import { ref, computed, onMounted } from 'vue';
+import {FormInst, DataTableColumns, useDialog, NButton} from 'naive-ui';
+import { useMessage, NTag, NModal } from 'naive-ui';
+import { ArrowRedo } from '@vicons/ionicons5';
+import { getSaleOrderList, deleteSaleOrder, editSaleOrder, addSaleOrder, approveSaleOrder } from '@/service/api/sale/order';
+import { addProductWorkOrder } from '@/service/api/plan/productOrder/index';
+import { getUserList } from '@/service/api/sale/userManage';
+import { getAllUnit } from '@/service/api/md/unit/index';
+import { getAllProductList } from '@/service/api/md/list/index';
+import { getTechnologyListLine } from '@/service/api/technology/technologyLine';
 import { dataTableConfig } from '@/config/dataTableConfig';
-import { useSearchBtn } from '~/src/hooks/common/useBtn';
-import { useLoading } from '~/src/hooks';
-import { getIngredientsLog, deleteIngredientsLogMistake, editIngredientsLog } from '~/src/service/api/wms/rawMaterial';
-import { formatDate } from '~/src/utils/form/rule';
+import { useAddBtn, useEditBtn, useDelBtn, useSearchBtn } from '~/src/hooks/common/useBtn';
+import { useLoading } from '~/src/hooks/index';
+import { useAuthStore } from '@/store';
+const dialog = useDialog();
+const authStore = useAuthStore();
 const { loading, startLoading, endLoading } = useLoading();
+const message = useMessage();
 
-const title = ref<string>('原料出入库');
-const socketStore = useSocketStore();
-const reprintShow = ref<boolean>(false);
-
-const reprintData = ref<{
-  type: string;
-  jobNumber: string;
-  reason: string;
-  transactionId: null | number;
-  codeSn: string;
-  reasonId: null | number;
-  templateType: null | string;
-}>({
-  type: '0',
-  jobNumber: '',
-  reason: '',
-  transactionId: null,
-  codeSn: '',
-  reasonId: null,
-  templateType: null
+type searchType = {
+	orderType: string | null;
+	orderCode: string;
+	pageNum: number;
+	pageSize: number;
+	total: number;
+};
+const typeOption = [
+	{
+		label: `客户订单`,
+		value: '0'
+	},
+	{
+		label: `备库订单`,
+		value: '1'
+	}
+];
+const routingOption = ref<any[]>([]);
+const flag = ref<boolean>(true);
+const data = ref<DataType[]>([]);
+const currentOrder = ref<any>(null);
+
+const optionsMap = ref({
+	'wtj': { label: '未提交', type: 'info' },
+	'dsp': { label: '待审批', type: 'warning' },
+	'0': { label: '已通过', type: 'success' },
+	'1': { label: '已下发', type: 'success' },
+	'2': { label: '已排产', type: 'success' },
+	'3': { label: '生产中', type: 'warning' },
+	'4': { label: '已完成', type: 'success' },
+	'5': { label: '已发货', type: 'success' },
+	'6': { label: '已驳回', type: 'error' },
+	'8': { label: '申请发货中', type: 'primary' },
+	'9': { label: '已通过待发货', type: 'success' },
+	'10': { label: '发货申请未通过', type: 'error' },
+	'11': { label: '出库中', type: 'success' },
+	'12': { label: '已发货', type: 'success' }
 });
-const searchForm = ref<rawMaterial1.searchForm>({
-  pageNum: 1,
-  pageSize: 10,
-  total: 0,
-  // ingredientsName: '',
-  status: null,
-  lotNumber: '',
-  ingredientsId: null,
-  productId: null,
-  itemId: null,
-  'params[beginTime]': null,
-  'params[endTime]': null,
-  codeSn: ''
-  // productName: ''
+
+const searchForm = ref<searchType>({
+	orderType: null,
+	orderCode: '',
+	pageNum: 1,
+	pageSize: 10,
+	total: 0
 });
-const options = [
-  {
-    label: `入库`,
-    value: '0'
-  },
-  {
-    label: `出库`,
-    value: '1'
-  }
-];
-const formModelRef = ref<FormInst | null>(null);
-const formReprintRef = ref<FormInst | null>(null);
-const message = useMessage();
-const dialog = useDialog();
-const formItemWidth = ref<string>('200px');
-const totalNumber = ref<any>(0);
-const netWeight = ref<any>(0);
-const tareNumber = ref<any>(0);
-const editShow = ref<boolean>(false);
+const rules = {
+	orderType: [
+		{
+			required: true,
+			message: '请输入订单类型'
+		}
+	],
+	model: [
+		{
+			required: true,
+			message: '请输入型号'
+		}
+	],
+	productId: [
+		{
+			required: true,
+			message: '请选择关联的产品'
+		}
+	],
+	weight: [
+		{
+			required: true,
+			message: '请输入数量'
+		}
+	],
+	measureId: [
+		{
+			required: true,
+			message: '请选择单位'
+		}
+	],
+	specification: [
+		{
+			required: true,
+			message: '请输入订单规格'
+		}
+	],
+	payTime: [
+		{
+			required: true,
+			message: '请选择交付日期'
+		}
+	]
+};
+const workorderRules = {
+	routingId: [
+		{
+			required: true,
+			message: '请选择工艺路线'
+		}
+	]
+};
+type addFormType = {
+	orderType: string | null;
+	customerName: string;
+	productId: string | null;
+	specification: string;
+	model: string;
+	weight: string;
+	measureId: string | null;
+	payTime: number | null;
+	customerId: string | null;
+};
+type addWorkorderFormType = {
+	orderId: number | null;
+	orderType: string | null;
+	customerName: string;
+	orderCode: string;
+	productId: number | null;
+	productSpecification: string;
+	productModel: string;
+	weight: string;
+	measureId: number | null;
+	payTime: number | null;
+	routingId: string | null;
+};
+const addForm = ref<addFormType>({
+	orderType: null,
+	customerName: '',
+	productId: null,
+	specification: '',
+	model: '',
+	weight: '',
+	measureId: null,
+	payTime: null,
+	customerId: null
+});
+const addWorkorderFormList = ref<Array<addWorkorderFormType>>([]);
+const isOneClickDelivery = ref<boolean>(false);
+const addWorkorderForm = ref<addWorkorderFormType>({
+	orderId: null,
+	orderType: null,
+	customerName: '',
+	orderCode: '',
+	productId: null,
+	productSpecification: '',
+	productModel: '',
+	weight: '',
+	measureId: null,
+	payTime: null,
+	routingId: null
+});
+const addFormRef = ref<FormInst | null>(null);
+const viewType = ref('');
 const checkedRowKeys = ref<Array<string | number>>([]);
-const range = ref<[number, number] | null>(null);
-// const forModel = ref<{ inDate: string | null }>({
-//   inDate: null
-// });
-const editFormModel = ref<any>({});
-// const printRules = {
-//   socketIp: createRequiredFormRule('请选择打印服务')
-// };
-const specificationList = ref<{ label: string; value: number }[]>([]);
-const merchantList = ref<{ label: string; value: number }[]>([]);
-const productNameList = ref<{ label: string; value: number }[]>([]);
-const manufacturerList = ref<{ label: string; value: number }[]>([]);
-const printCauseList = ref<{ label: string; value: number }[]>([]);
-const printTypeList = ref<{ label: string; value: string }[]>([
-  { label: '中拉原料入库补打', value: 'middleDrawRaw' },
-  { label: '大拉原料入库补打', value: 'boxButtons' }
-]);
-const rawMaterial1Row = ref<rawMaterial1.tabelList | null>(null);
-// const showDialog = ref<boolean>(false);
-const rowKey = (row: any) => row.id;
+const addWorkorderFormRef = ref<FormInst | null>(null);
+function handleSearch() {
+	searchForm.value.pageNum = 1;
+	init();
+}
+function handleReset() {
+	searchForm.value = {
+		orderType: null,
+		orderCode: '',
+		pageNum: 1,
+		pageSize: 10,
+		total: 0
+	};
+	init();
+}
 
-const rules = {
-  ingredientsId: createRequiredFormRule('请选择贸易商'),
-  productId: createRequiredFormRule('请选择品名'),
-  itemId: createRequiredFormRule('请选择规格'),
-  manufacturerId: createRequiredFormRule('请选择材料厂家'),
-  lotNumber: createRequiredFormRule('请输入批号'),
-  partNumber: createRequiredFormRule('请输入料号')
+// 格式化日期
+function formatDate(timestamp: number) {
+	if (!timestamp) return '';
+	const date = new Date(timestamp);
+	return `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date.getDate().toString().padStart(2, '0')}`;
+}
+type DataType = {
+	id: number;
+	orderType: string | null;
+	customerName: string;
+	orderCode: string;
+	specification: string;
+	model: string;
+	weight: string;
+	measureId: number | null;
+	measureName: string;
+	payTime: number;
+	status: string; // 0:未提交, 1:待审批, 2:已审批, 3:已驳回
+	productId: number;
+	createBy?: string; // 审批人
+	applyBy?: string; // 申请人
+	checkedBy?: string; // 审批人
+	approveBy?: string; // 审批人
+	checkedTime?: number; // 审批时间
+	applyTime?: number; // 审批时间
+	approveTime?: number; // 审批时间
+	remark?: string; // 审批意见
+	approveRemark?: string; // 审批意见
+	producName?: string; // 审批意见
+	color?: string; // 审批意见
 };
+function changeType(str: any) {
+	if (str === '0') {
+		return 'default';
+	} else if (str === '1') {
+		return 'warning';
+	} else if (str === '2') {
+		return 'success';
+	} else if (str === '3') {
+		return 'error';
+	}
+	return 'error';
+}
+const unitOptions = ref<{ value: string; label: string }[]>([]);
+const productOptions = ref<{ value: string; label: string }[]>([]);
+const customerOptions = ref<{ value: string; label: string }[]>([]);
+const rowKey = (row: any) => row.id;
 
-const reprintRules = {
-  reason: createRequiredFormRule('请输入打印原因'),
-  templateType: createRequiredFormRule('请选择补打模板')
+// 审批相关变量
+const approveModalVisible = ref(false);
+const approveForm = ref<{
+	id: number | string | null; // 单个订单ID或批量订单ID列表(逗号分隔)
+	status: string;
+	remark: string;
+}>({
+	id: null,
+	status: '',
+	remark: ''
+});
+const approveRules = {
+	remark: [{ required: true, message: '请输入审批意见' }]
 };
 
-const data = ref<rawMaterial1.tabelList[]>([]);
-
-const columns: Ref<DataTableColumns<rawMaterial1.tabelList>> = ref([
-  {
-    type: 'selection'
-  },
-  {
-    title: '序号',
-    key: 'index',
-    align: 'center',
-    width: 70,
-    render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
-  },
-  {
-    title: '二维码编号',
-    key: 'codeSn',
-    width: 100,
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '贸易商',
-    width: 100,
-    key: 'ingredientsName',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '品名',
-    width: 100,
-    key: 'productName'
-  },
-  {
-    title: '规格',
-    width: 100,
-    key: 'itemSpecification'
-  },
-  {
-    title: '批号',
-    width: 100,
-    key: 'lotNumber',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '料号',
-    width: 100,
-    key: 'partNumber',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-
-  // {
-  //   title: '毛重',
-  //   width: 100,
-  //   key: 'grossWeight'
-  // },
-
-  {
-    title: '数量',
-    width: 100,
-    key: 'netWeight'
-  },
-
-  // {
-  //   title: '皮重',
-  //   width: 100,
-  //   key: 'tareWeight'
-  // },
-  {
-    title: '单位',
-    width: 100,
-    key: 'measureName',
-    render: () => '付'
-  },
-  {
-    title: '材料厂家',
-    width: 100,
-    key: 'manufacturerName',
-    ellipsis: {
-      tooltip: true
-    }
-  },
-  {
-    title: '状态',
-    width: 100,
-    key: 'status',
-    render: (row: any) => {
-      let colorText = '';
-      let showText = '';
-      let showTag = true;
-      switch (row.status) {
-        case '0':
-          colorText = 'success';
-          showText = '入库';
-          break;
-        case '1':
-          colorText = 'error';
-          showText = '出库';
-          break;
-        default:
-          showTag = false;
-          break;
-      }
-      return (
-        <n-tag v-show={showTag} type={colorText}>
-          {showText}
-        </n-tag>
-      );
-    }
-  },
-  {
-    title: '出入库时间',
-    key: 'createTime',
-    width: 180
-  },
-  {
-    title: '操作',
-    width: 220,
-    key: 'action',
-    fixed: 'right',
-    render: (row: any) => {
-      return (
-        <n-space justify={'center'}>
-          <n-button size="small" type="warning" onClick={() => editRow(row)}>
-            编辑
-          </n-button>
-          <n-button
-            type="error"
-            size="small"
-            v-show={row.status === '0'}
-            onClick={() => handleDeleteItemType(deleteIngredientsLogMistake, row.id)}
-          >
-            删除
-          </n-button>
-        </n-space>
-      );
-    }
-  }
+// 权限判断
+const hasApprovePermission = computed(() =>
+	authStore.userInfo.roles.includes('CKGL') || authStore.userInfo.userName === 'admin'
+);
+
+const columns: Ref<DataTableColumns<DataType>> = ref([
+	{
+		type: 'selection',
+		disabled(row) {
+			return (row.status as string) !== '0';
+		}
+	},
+	{
+		title: '序号',
+		key: 'index',
+		width: 50,
+		align: 'center',
+		render: (_row, index) => (searchForm.value.pageNum - 1) * searchForm.value.pageSize + index + 1
+	},
+	{
+		title: '订单类型',
+		key: 'orderType',
+		width: 150,
+		render: (row: any) => (
+			<n-tag type={row.orderType === '0' ? 'success' : 'warning'}>
+				{row.orderType === '0' ? '客户订单' : '备库订单'}
+			</n-tag>
+		)
+	},
+	{
+		title: '产品信息',
+		align: 'center',
+		key: 'producName',
+		width: 150,
+		render: (row) => {
+			return row.producName + '（' + row.color + '）';
+		}
+	},
+	{
+		title: '客户名称',
+		align: 'center',
+		key: 'customerName',
+		width: 150,
+	},
+	{
+		title: '订单编号',
+		align: 'center',
+		key: 'orderCode',
+		width: 150,
+	},
+	{
+		title: '规格型号',
+		align: 'center',
+		key: 'specification',
+		width: 150,
+	},
+	{
+		title: '数量',
+		align: 'center',
+		key: 'weight',
+		width: 80,
+	},
+	{
+		title: '单位',
+		align: 'center',
+		width: 80,
+		key: 'measureName'
+	},
+	{
+		title: '交付时间',
+		align: 'center',
+		key: 'payTime',
+		width: 150,
+	},
+	{
+		title: '创建时间',
+		align: 'center',
+		width: 180,
+		key: 'createTime'
+	},
+	{
+		title: '状态',
+		align: 'center',
+		key: 'status',
+		width: 80,
+		render: (row: DataType) => {
+			const { label, type } = optionsMap.value[row.status || '0'];
+			return <NTag type={type}>{label}</NTag>;
+		}
+	},
+	{
+		title: '申请人',
+		align: 'center',
+		key: 'applyBy',
+		width: 150,
+		render: (row: DataType) => {
+			return row.applyBy == 'admin' ? '跟单': row.applyBy;
+		}
+	},
+	{
+		title: '申请时间',
+		align: 'center',
+		key: 'applyTime',
+		width: 150,
+		render: (row: DataType) => {
+			return row.applyTime ? new Date(row.applyTime).toLocaleDateString() : '-';
+		}
+	},
+	{
+		title: '审批人',
+		align: 'center',
+		width: 150,
+		key: 'approveBy',
+		render: (row) => {
+			return row.approveBy || '-';
+		}
+	},
+	{
+		title: '审批意见',
+		align: 'center',
+		width: 150,
+		key: 'approveRemark',
+		render: (row) => {
+			return row.approveRemark || '-';
+		}
+	},
+	{
+		title: '审批时间',
+		align: 'center',
+		key: 'approveTime',
+		width: 150,
+		render: (row: DataType) => {
+			return row.approveTime ? new Date(row.approveTime).toLocaleDateString() : '-';
+		}
+	},
+	{
+		title: '操作',
+		align: 'center',
+		key: 'actions',
+		fixed: 'right',
+		width: 220,
+		render: row => {
+			const actions:any[] = [];
+			actions.push(
+				<n-button size="small" type="warning" onClick={() => handleApprove(row, 'see')}>
+					明细
+				</n-button>
+			);
+			// 提交审批按钮
+			if (row.status === 'wtj') {
+				actions.push(
+					<n-button size="small" type="primary" onClick={() => handleSubmitApprove(row)}>
+						提交审批
+					</n-button>
+				);
+			}
+
+			// 审批按钮组
+			if (row.status === '8' && hasApprovePermission.value) {
+				actions.push(
+					<n-button size="small" type="success" onClick={() => handleApprove(row, 'APPROVE')}>审批
+					</n-button>
+				);
+			}
+
+			// 下发工单按钮
+			if (row.status === '9') {
+				actions.push(
+					<n-button color="#8a2be2" size="small" class="mr" onClick={() => handleInfo(row)}>
+						<ArrowRedo class="mr-1px text-15px w-13px" />执行出库
+					</n-button>
+				);
+			}
+
+			if(row.status === 'wtj' || row.status === '6'){
+				actions.push(
+					useEditBtn(() => {
+						handleEdit(row);
+					}, 'small')
+				)
+			}
+
+
+			return actions;
+		}
+	}
 ]);
 
-function editRow(row: rawMaterial1.tabelList) {
-  editShow.value = true;
-  editFormModel.value = row;
+const checked = ref<(string | number)[]>([]);
+const handleCheck = (rowKeys: (string | number)[]) => {
+	addWorkorderFormList.value = [];
+	if (rowKeys.length > 0) {
+		rowKeys.forEach(item => {
+			const row = data.value.find(val => val.id === item);
+			if (row) {
+				addWorkorderFormList.value.push({
+					orderId: row.id,
+					orderType: row.orderType,
+					customerName: row.customerName,
+					orderCode: row.orderCode,
+					productId: row.productId,
+					productSpecification: row.specification,
+					productModel: row.model,
+					weight: row.weight,
+					measureId: row.measureId,
+					payTime: row.payTime,
+					routingId: null
+				});
+			}
+		});
+	}
+	checked.value = rowKeys;
+};
+
+// 弹窗
+const workorderFlag = ref<boolean>(false);
+const approveFormRef = ref<any | null>(null);
+function oneClickDelivery() {
+	workorderFlag.value = true;
+	isOneClickDelivery.value = true;
 }
 
-function submitReprint() {
-  if (!formReprintRef.value) return;
-  formReprintRef.value.validate(errors => {
-    if (!errors) {
-      if (rawMaterial1Row.value === null) return;
-      reprintData.value.transactionId = rawMaterial1Row.value.id;
-      reprintData.value.codeSn = rawMaterial1Row.value.codeSn;
-      const reprintDatas = { ...reprintData.value };
-      socketStore.setMsg(
-        JSON.stringify({
-          templateType: reprintData.value.templateType,
-          printValue: [rawMaterial1Row.value],
-          reprintData: reprintDatas
-        })
-      );
-      message.success('已发送打印命令');
-      reprintShow.value = false;
-      reprintData.value.reason = '';
-    }
-  });
+const dialogFlag = ref<boolean>(false);
+const handleCancel = () => {
+	dialogFlag.value = false;
+	addForm.value = {
+		orderType: null,
+		customerName: '',
+		productId: null,
+		specification: '',
+		model: '',
+		weight: '',
+		measureId: null,
+		payTime: null,
+		customerId: null
+	};
+};
+function customerHandleChange(val, item) {
+	addForm.value.customerId = val;
+	addForm.value.customerName = item.label;
 }
+const handleProductCancel = () => {
+	workorderFlag.value = false;
+	addWorkorderForm.value = {
+		orderId: null,
+		orderType: null,
+		customerName: '',
+		orderCode: '',
+		productId: null,
+		productSpecification: '',
+		productModel: '',
+		weight: '',
+		measureId: null,
+		payTime: null,
+		routingId: null
+	};
+};
+const workorderHandleCancel = () => {
+	workorderFlag.value = false;
+	addWorkorderForm.value.orderId = null;
+};
 
-function submitEdit() {
-  if (!formModelRef.value) return;
-  formModelRef.value.validate(errors => {
-    if (!errors) {
-      editIngredientsLog(editFormModel.value).then(res => {
-        if (res.code === 200) {
-          message.success('修改成功');
-          editShow.value = false;
-          init();
-        }
-      });
-    }
-  });
+function handleSend(row){
+	return dialog.warning({
+		title: '提示',
+		content:"申请后需仓管审核后发货，确认申请发货？",
+		style: {
+			borderRadius: '10px'
+		},
+		positiveText: '确定',
+		negativeText: '取消',
+		maskClosable: false,
+		onClose: () => {
+			console.log(1);
+		},
+		onPositiveClick: () => {
+			editSaleOrder({id: row.id, status: '8'}).then((res: any) => {
+				if (res.code === 200) {
+					message.success('申请成功');
+					init();
+				}
+			});
+		},
+		onNegativeClick: () => {
+			console.log(1);
+		}
+	});
 }
+function handleInfo(row) {
+	if (row.status !== '9') {
+		message.warning('请先完成订单审批');
+		return;
+	}
 
-// function lookReport() {
-//   let url = 'http://huaerda-jimu.24yt.com/jmreport/view/986870961181822976';
-//   let searchValue = '';
-//   let isAddQuestionMask = false;
-//   const filterData = ['pageNum', 'pageSize', 'total', 'params[beginTime]', 'params[endTime]'];
-//   for (const key in searchForm.value) {
-//     if (searchForm.value[key] && !filterData.includes(key)) {
-//       if (!isAddQuestionMask) {
-//         searchValue += `?${key}=${searchForm.value[key]}`;
-//         isAddQuestionMask = true;
-//       } else {
-//         searchValue += `&${key}=${searchForm.value[key]}`;
-//       }
-//     }
-//   }
-//   if (range.value !== null) {
-//     const day = 1000 * 60 * 60 * 24;
-//     const beginTime = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
-//     const endTime = formatDate(new Date(new Date(range.value[1]).getTime() + day), 'yyyy-MM-dd');
-//     if (isAddQuestionMask) {
-//       searchValue += `&beginTime=${beginTime}&endTime=${endTime}`;
-//     } else {
-//       searchValue = `?beginTime=${beginTime}&endTime=${endTime}`;
-//     }
-//   }
-//   //  if (forModel.value.inDate) {
-//   //    if (isAddQuestionMask) {
-//   //      searchValue += `&inDate=${forModel.value.inDate}`;
-//   //    } else {
-//   //      searchValue = `?inDate=${forModel.value.inDate}`;
-//   //    }
-//   //  }
-//   url += searchValue;
-//   window.open(url, 'rawMaterial');
-// }
-
-const sleep = (func: any, params: any) =>
-  new Promise(resolve => {
-    func(params).then(res => {
-      resolve(res);
-    });
-  });
-
-const handleCheck = (e, val) => {
-  console.log('e ==> ', e);
-  console.log('val ==> ', val);
-  // checkedRowKeys.value = [];
-  // val.forEach(item => {
-  //   if (item.status) {
-  //     if (item.status === '0') {
-  //     checkedRowKeys.value.push(item.id)
-  //   }
-  //   }
-
-  // });
-};
+	viewType.value = 'exceue'
+	currentOrder.value = row;
+	approveModalVisible.value = true;
+
+}
+
+async function handleSubmit() {
+	await addFormRef.value?.validate(errors => {
+		if (!errors) {
+			if (flag.value) {
+				addSaleOrder({...addForm.value, status: 'wtj'}).then((res: any) => {
+					if (res.code === 200) {
+						message.success('添加成功');
+						handleCancel();
+						init();
+					}
+				});
+			} else {
+				editSaleOrder({...addForm.value, status: 'wtj'}).then((res: any) => {
+					if (res.code === 200) {
+						message.success('修改成功');
+						handleCancel();
+						init();
+					}
+				});
+			}
+		}
+	});
+}
+async function workorderHandleSubmit() {
+	await addWorkorderFormRef.value?.validate(errors => {
+		if (!errors) {
+			if (isOneClickDelivery.value) {
+				addWorkorderFormList.value.forEach(item => {
+					item.routingId = addWorkorderForm.value.routingId;
+				});
+			}
+			addProductWorkOrder(addWorkorderFormList.value).then((res: any) => {
+				if (res.code === 200) {
+					message.success('下发成功');
+					handleProductCancel();
+					init();
+					if (isOneClickDelivery.value) {
+						checkedRowKeys.value = [];
+					}
+				}
+			});
+		}
+	});
+}
+function handleEdit(row) {
+	dialogFlag.value = true;
+	flag.value = false;
+	addForm.value = {
+		...row,
+		payTime: new Date(row.payTime as unknown as string) as unknown as null
+	};
+}
 
-function handleDeleteItemType(func: any, params: any): void {
-  const d = dialog.warning({
-    title: '提示',
-    content: '确认要进行删除吗?',
-    positiveText: '确认',
-    negativeText: '取消',
-    onPositiveClick: () => {
-      d.loading = true;
-      return new Promise((resolve, reject) => {
-        sleep(func, params)
-          .then((res: any) => {
-            resolve(res);
-            if (res.code === 200) {
-              message.success('删除成功');
-              init();
-            }
-          })
-          .catch(err => {
-            reject(err);
-          });
-      });
-    }
-  });
+// 审批相关函数
+function handleApprove(row: any, status: string) {
+	if(status === 'see'){
+		viewType.value = 'view';
+	}else{
+		viewType.value = 'APPROVE';
+	}
+	currentOrder.value = row;
+	approveModalVisible.value = true;
 }
 
-function search() {
-  if (range.value !== null) {
-    searchForm.value['params[beginTime]'] = formatDate(new Date(range.value[0]), 'yyyy-MM-dd');
-    searchForm.value['params[endTime]'] = formatDate(new Date(range.value[1]), 'yyyy-MM-dd');
-  } else {
-    searchForm.value['params[beginTime]'] = null;
-    searchForm.value['params[endTime]'] = null;
-  }
-  totalNumber.value = 0;
-  netWeight.value = 0;
-  tareNumber.value = 0;
-  // searchForm.value.pageNum = 1;
-  init();
+async function handleAudit(row:any,status: 'APPROVE' | 'REJECT' | 'exceue') {
+	approveForm.value = {
+		id: row.id,
+		status: status === 'APPROVE' ? '9' : '10',
+		remark: approveForm.value.remark
+	};
+	handleApproveSubmit()
 }
 
-function reset() {
-  searchForm.value = {
-    pageNum: 1,
-    pageSize: 10,
-    status: null,
-    total: 0,
-    // ingredientsName: '',
-    lotNumber: '',
-    ingredientsId: null,
-    productId: null,
-    itemId: null,
-    'params[beginTime]': null,
-    'params[endTime]': null,
-    codeSn: ''
-  };
-  range.value = null;
-  search();
+async function handleExecute(row:any,status: 'APPROVE' | 'REJECT' | 'execute') {
+	return dialog.warning({
+		title: '提示',
+		content:"确认出库？",
+		style: {
+			borderRadius: '10px'
+		},
+		positiveText: '确定',
+		negativeText: '取消',
+		maskClosable: false,
+		onClose: () => {
+			console.log(1);
+		},
+		onPositiveClick: () => {
+			editSaleOrder({id: row.id, status: '11'}).then((res: any) => {
+				if (res.code === 200) {
+					message.success('操作成功');
+					approveModalVisible.value = false;
+					init();
+				}
+			});
+		},
+		onNegativeClick: () => {
+			console.log(1);
+		}
+	});
+}
+async function handleApproveSubmit() {
+	await approveFormRef.value?.validate(errors => {
+		if (!errors) {
+			const api = approveSaleOrder;
+
+			api({
+				id: approveForm.value.id,
+				status: approveForm.value.status,
+				approveRemark: approveForm.value.remark,
+				attr1: 'sendApprove'
+			}).then(res => {
+				if (res.code === 200) {
+					message.success(`审批${approveForm.value.status === '9' ? '通过' : '驳回'}成功`);
+					approveModalVisible.value = false;
+					init();
+				} else {
+					message.error(res.msg || '审批失败');
+				}
+			});
+		}
+	});
 }
 
-// function openSelectSocket(row: rawMaterial1.tabelList) {
-//   rawMaterial1Row.value = row;
-//   reprintShow.value = true;
-// }
-
-function getList() {
-  getMaterialList({ pageSize: 999 }).then(res => {
-    if (res.code === 200) {
-      res.rows.forEach(item => {
-        if (item.workstageName === ' ') {
-          specificationList.value.push({ label: item.specification, value: item.id });
-        }
-      });
-    }
-  });
-
-  getDictDataList({ dictType: 'print_cause', pageSize: 999 }).then(res => {
-    if (res.code === 200) {
-      res.rows.forEach(item => {
-        printCauseList.value.push({ label: item.dictLabel, value: item.dictValue });
-      });
-    }
-  });
-
-  getIngredientsTradersList({ pageSize: 999 }).then(res => {
-    if (res.code === 200) {
-      res.rows.forEach(item => {
-        merchantList.value.push({ label: item.tradersName, value: item.id });
-      });
-    }
-  });
-
-  getIngredientsManufacturerList({ pageSize: 999 }).then(res => {
-    if (res.code === 200) {
-      res.rows.forEach(item => {
-        manufacturerList.value.push({ label: item.manufacturerName, value: item.id, ...item });
-      });
-    }
-  });
-
-  getIngredientsProductNameList({ pageSize: 999 }).then(res => {
-    if (res.code === 200) {
-      res.rows.forEach(item => {
-        productNameList.value.push({ label: item.productName, value: item.id });
-      });
-    }
-  });
+function handleApproveCancel() {
+	approveModalVisible.value = false;
+}
+
+// 提交审批
+function handleSubmitApprove(row: DataType) {
+	editSaleOrder({ ...row, status: 'dsp' }).then(res => {
+		if (res.code === 200) {
+			message.success('提交审批成功');
+			init();
+		} else {
+			message.error(res.msg || '提交失败');
+		}
+	});
+}
+
+// 撤销审批
+function handleCancelApprove(row: DataType) {
+	editSaleOrder({ ...row, status: '0' }).then(res => {
+		if (res.code === 200) {
+			message.success('撤销审批成功');
+			init();
+		} else {
+			message.error(res.msg || '撤销失败');
+		}
+	});
 }
 
 function init() {
-  startLoading();
-  getIngredientsLog({ ...searchForm.value }).then(res => {
-    if (res.code === 200) {
-      data.value = res.rows;
-      searchForm.value.total = res.total;
-      totalNumber.value = res.count;
-      netWeight.value = res.totalNetWeight;
-      tareNumber.value = res.totalTareWeight;
-    }
-    endLoading();
-  });
+	startLoading();
+	data.value = [];
+	getSaleOrderList({...searchForm.value, attr1: 'send'}).then(res => {
+		data.value = res.rows;
+		searchForm.value.total = res.total;
+	});
+	endLoading();
 }
 onMounted(() => {
-  init();
-  getList();
-  const userInfo = localStg.get('userInfo');
-  if (userInfo) {
-    reprintData.value.jobNumber = userInfo.jobNumber;
-  }
+	init();
+	getTechnologyListLine().then(res => {
+		if (res.code === 200) {
+			routingOption.value = [];
+			res.data.forEach((item: any) => {
+				routingOption.value.push({
+					label: item.routingName,
+					value: item.id
+				});
+			});
+		}
+	});
+	getAllUnit().then(res => {
+		if (res.code === 200) {
+			unitOptions.value = [];
+			res.data.forEach((item: any) => {
+				unitOptions.value.push({
+					label: item.measureName,
+					value: item.id
+				});
+			});
+		}
+	});
+	getAllProductList().then(res => {
+		if (res.code === 200) {
+			productOptions.value = [];
+			res.data.forEach((item: any) => {
+				productOptions.value.push({
+					label: `${item.productName} (${item.productSize})`,
+					value: item.id
+				});
+			});
+		}
+	});
+	getUserList(null).then(res => {
+		if (res.code === 200) {
+			customerOptions.value = [];
+			res.rows.forEach((item: any) => {
+				customerOptions.value.push({
+					label: item.clientName,
+					value: item.id
+				});
+			});
+		}
+	});
 });
 </script>
 
 <style scoped>
-.active {
-  background-color: lightgreen !important;
-  color: #fff !important;
-}
 
-:deep(.n-input__input-el) {
-  color: black !important;
+:deep(.n-space){
+	margin-right: 5px;
 }
-:deep(.n-space) {
-  justify-content: flex-start !important;
+:deep(.n-dialog.n-modal){
+	width: 860px !important;
 }
 </style>
diff --git a/src/views/system/log/login/index.vue b/src/views/system/log/login/index.vue
index 19bbf63..f68412a 100644
--- a/src/views/system/log/login/index.vue
+++ b/src/views/system/log/login/index.vue
@@ -200,11 +200,11 @@ const columns: Ref<DataTableColumns<LoginManagement.LoginType>> = ref([
     align: 'center'
   },
 
-  {
-    title: '地址',
-    key: 'ipaddr',
-    align: 'center'
-  },
+  // {
+  //   title: '地址',
+  //   key: 'ipaddr',
+  //   align: 'center'
+  // },
 
   {
     title: '描述',
diff --git a/src/views/system/log/operate/index.vue b/src/views/system/log/operate/index.vue
index 1041a14..ffde947 100644
--- a/src/views/system/log/operate/index.vue
+++ b/src/views/system/log/operate/index.vue
@@ -275,12 +275,12 @@ const columns: Ref<DataTableColumns<OperaManagement.OperaType>> = ref([
     align: 'center',
     width: 100
   },
-  {
-    title: '主机',
-    key: 'operIp',
-    align: 'center',
-    width: 140
-  },
+  // {
+  //   title: '主机',
+  //   key: 'operIp',
+  //   align: 'center',
+  //   width: 140
+  // },
   {
     title: '操作状态',
     key: 'status',
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6264a3b..b745963 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -281,12 +281,12 @@ const columns: Ref<DataTableColumns<UserManagement.User>> = ref([
     align: 'center',
     width: 60
   },
-  {
-    title: '用户编号',
-    key: 'id',
-    align: 'center',
-    width: 120
-  },
+  // {
+  //   title: '用户编号',
+  //   key: 'id',
+  //   align: 'center',
+  //   width: 120
+  // },
   {
     title: '用户名称',
     key: 'name',