From 9a85f1bd138cf4334ba267588abb2526706763d2 Mon Sep 17 00:00:00 2001
From: Fsd0511 <422865775@qq.com>
Date: Thu, 28 Aug 2025 17:29:25 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/orderManager/index.js                     |  29 +
 components/dict-tag/dict-tag.vue              | 185 ++++
 config.js                                     |   4 +-
 main.js                                       |   4 +-
 manifest.json                                 |  36 +-
 pages.json                                    |  15 +
 pages/work/OrderApproval/OrderDetail.vue      |  61 +-
 pages/work/OrderManager/components/NewAdd.vue | 814 ++++++++++++++++++
 .../OrderManager/components/OrderDetail.vue   | 449 ++++++++++
 pages/work/OrderManager/components/data1.js   | 113 +++
 pages/work/OrderManager/data.js               |  49 ++
 pages/work/OrderManager/detail.vue            |  34 +
 pages/work/OrderManager/detailData.js         |  72 ++
 pages/work/OrderManager/index.vue             | 296 +++++++
 pages/work/index.vue                          |  11 +
 15 files changed, 2101 insertions(+), 71 deletions(-)
 create mode 100644 api/orderManager/index.js
 create mode 100644 components/dict-tag/dict-tag.vue
 create mode 100644 pages/work/OrderManager/components/NewAdd.vue
 create mode 100644 pages/work/OrderManager/components/OrderDetail.vue
 create mode 100644 pages/work/OrderManager/components/data1.js
 create mode 100644 pages/work/OrderManager/data.js
 create mode 100644 pages/work/OrderManager/detail.vue
 create mode 100644 pages/work/OrderManager/detailData.js
 create mode 100644 pages/work/OrderManager/index.vue

diff --git a/api/orderManager/index.js b/api/orderManager/index.js
new file mode 100644
index 0000000..93e88ed
--- /dev/null
+++ b/api/orderManager/index.js
@@ -0,0 +1,29 @@
+import request from '@/utils/request'
+export function listsalemain(data,query) {
+    return request({
+        url: '/bussiness/salemain/list',
+        method: 'post',
+        data: data,
+        params: query,
+        
+    })
+}
+// 查询s生产单位列表
+export function listproductList(data,query) {
+  return request({
+    url: '/system/dept/productList',
+    method: 'get',
+    data:data,
+    params: query
+  })
+}
+// 新建销售订单时候的商品列表
+export function listsaleBusGoodsList(data,query) {
+    return request({
+        url: '/bussiness/businessgoods/saleBusGoodsList',
+        method: 'post',
+        data: data,
+        params: query,
+       
+    })
+}
\ No newline at end of file
diff --git a/components/dict-tag/dict-tag.vue b/components/dict-tag/dict-tag.vue
new file mode 100644
index 0000000..2545cad
--- /dev/null
+++ b/components/dict-tag/dict-tag.vue
@@ -0,0 +1,185 @@
+<!-- components/uni-app-tag/uni-app-tag.vue -->
+<template>
+  <view class="uni-app-tag-container">
+    <!-- 匹配的标签 -->
+    <template
+      v-for="(item, index) in matchedItems"
+      :key="getValue(item)"
+    >
+      <!-- 普通 span（default 类型 + 无 class） -->
+      <span
+        v-if="isDefaultTag(item)"
+        class="uni-app-tag-span"
+        :class="item.elTagClass"
+      >
+        {{ getText(item) }}&nbsp;
+      </span>
+
+      <!-- 自定义样式 view 模拟 tag -->
+      <view
+        v-else
+        class="uni-app-tag"
+        :class="[
+          `uni-app-tag--${getUniType(item.elTagType)}`,
+          item.elTagClass
+        ]"
+      >
+        {{ getText(item) }}
+      </view>
+    </template>
+
+    <!-- 未匹配的值 -->
+    <text v-if="unmatch && showValue" class="uni-app-tag-unmatch">
+      {{ unmatchText }}
+    </text>
+  </view>
+</template>
+
+<script setup>
+import { computed } from 'vue'
+
+const props = defineProps({
+  /* 选项数组 */
+  options: {
+    type: Array,
+    default: () => []
+  },
+  /* 当前值：String | Number | Array */
+  value: [String, Number, Array],
+  /* 是否显示未匹配值 */
+  showValue: {
+    type: Boolean,
+    default: true
+  },
+  /* 字符串分隔符（仅 value 为字符串时生效） */
+  separator: {
+    type: String,
+    default: ','
+  },
+  /* 字段映射：值字段名 */
+  valueField: {
+    type: String,
+    default: 'dictValue'
+  },
+  /* 字段映射：文本字段名 */
+  textField: {
+    type: String,
+    default: 'dictLabel'
+  }
+})
+
+/* 工具函数：统一取出值 / 文本 */
+const getValue = (opt) => String(opt[props.valueField])
+const getText  = (opt) => opt[props.textField] ?? ''
+
+/* 1. 统一转成字符串数组 */
+const values = computed(() => {
+  if (props.value == null || props.value === '') return []
+  return Array.isArray(props.value)
+    ? props.value.map(String)
+    : String(props.value).split(props.separator).map(v => v.trim())
+})
+
+/* 2. 匹配到的选项 */
+const matchedItems = computed(() =>
+  values.value
+    .map(val => props.options.find(opt => getValue(opt) === val))
+    .filter(Boolean)
+)
+
+/* 3. 未匹配的值 */
+const unmatchArray = computed(() => {
+  if (!values.value.length || !props.options.length) return []
+  return values.value.filter(
+    val => !props.options.some(opt => getValue(opt) === val)
+  )
+})
+const unmatch     = computed(() => unmatchArray.value.length > 0)
+const unmatchText = computed(() => unmatchArray.value.join(' '))
+
+/* 4. 判断是否为默认 tag（default 且无自定义 class） */
+const isDefaultTag = (item) => {
+  const type = item.elTagType || 'default'
+  const cls  = item.elTagClass || ''
+  return (type === 'default' || !type) && !cls
+}
+
+/* 5. el-tag type -> uni 类名映射 */
+const getUniType = (type) => {
+  const map = {
+    primary: 'primary',
+    success: 'success',
+    warning: 'warning',
+    danger:  'error',
+    info:    'info',
+    default: 'default'
+  }
+  return map[type] || 'default'
+}
+</script>
+
+<style scoped>
+.uni-app-tag-container {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  font-size: 14px;
+}
+
+.uni-app-tag-span {
+  margin-right: 8px;
+  white-space: nowrap;
+}
+
+.uni-app-tag {
+  display: inline-flex;
+  align-items: center;
+  padding: 2px 8px;
+  border-radius: 4px;
+  font-size: 12px;
+  margin-right: 8px;
+  white-space: nowrap;
+}
+
+.uni-app-tag--primary {
+  background-color: #d0e3ff;
+  color: #0066ff;
+  border: 1px solid #99ccff;
+}
+
+.uni-app-tag--success {
+  background-color: #dcf5e7;
+  color: #00aa55;
+  border: 1px solid #88ccaa;
+}
+
+.uni-app-tag--warning {
+  background-color: #fff0d9;
+  color: #cc8800;
+  border: 1px solid #ffcc88;
+}
+
+.uni-app-tag--error {
+  background-color: #ffd9dc;
+  color: #ff3344;
+  border: 1px solid #ff99aa;
+}
+
+.uni-app-tag--info {
+  background-color: #e6e6e6;
+  color: #666666;
+  border: 1px solid #cccccc;
+}
+
+.uni-app-tag--default {
+  background-color: #f4f4f4;
+  color: #333;
+  border: 1px solid #ddd;
+}
+
+.uni-app-tag-unmatch {
+  margin-left: 4px;
+  color: #999;
+  font-size: 12px;
+}
+</style>
\ No newline at end of file
diff --git a/config.js b/config.js
index f9c5bc2..b3dae19 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
 // 应用全局配置
 export default {
-  baseUrl: 'https://vue.ruoyi.vip/prod-api',   //
+  // baseUrl: 'https://vue.ruoyi.vip/prod-api',   //
    // baseUrl: '/prod-api',    //前后端分离版的接口地址，转发代理 设置在了manifest.json文件中
-   // baseUrl: 'http://192.168.3.27:18090',    //前后端分离版的接口地址
+   baseUrl: 'http://106.15.139.36:18090',    //前后端分离版的接口地址
     //测试提交
   // 应用信息
   appInfo: {
diff --git a/main.js b/main.js
index 76aa9bd..cbe9a47 100644
--- a/main.js
+++ b/main.js
@@ -4,10 +4,12 @@ import store from './store' // store
 import { install } from './plugins' // plugins
 import './permission' // permission
 import { useDict } from '@/utils/dict'
-
+// 全局注册 dict-tag 组件
+// import DictTag from '@/components/dict-tag/dict-tag.vue';
 export function createApp() {
   const app = createSSRApp(App)
   app.use(store)
+  // app.component('dict-tag', DictTag);
   app.config.globalProperties.useDict = useDict
   install(app)
   return {
diff --git a/manifest.json b/manifest.json
index c87595c..d1ee0f3 100644
--- a/manifest.json
+++ b/manifest.json
@@ -57,24 +57,24 @@
     },
     "vueVersion" : "3",
     "h5" : {
-        "template" : "static/index.html",
-        "devServer" : {
-            "port" : 30088,
-            "https" : false
-            // "proxy" : {
-            //     "/prod-api" : {
-            //         "target" : "http://192.168.0.3:18090/",
-            //         "changeOrigin" : true,
-            //         "secure" : false,
-            //         "pathRewrite" : {
-            //             "^/prod-api" : "/"
-            //         },
-            //         "headers" : {
-            //             "Origin" : "http://192.168.0.3:18090/",
-            //             "Referer" : "http://192.168.0.3:18090/"
-            //         }
-            //     }
-            // }
+        "template" : "static/index.html"
+        // "devServer" : {
+        //     "port" : 30088,
+        //     "https" : false,
+        //     "proxy": {
+        //         "/prod-api":{
+        //             "target" : "http://106.15.139.36:18090",
+        //             "changeOrigin" : true,
+        //             "secure" : false,
+        //             "pathRewrite" : {
+        //                 "^/prod-api" : "/"
+        //             },
+        //             "headers" : {
+        //                 "Origin" : "http://106.15.139.36:18090",
+        //                 "Referer" : "http://106.15.139.36:18090"
+        //             }
+        //         }
+        //     }
         },
         "title" : "RuoYi-App",
         "router" : {
diff --git a/pages.json b/pages.json
index 5467be5..6ac2ba9 100644
--- a/pages.json
+++ b/pages.json
@@ -20,6 +20,11 @@
     "style": {
       "navigationBarTitleText": "工作台"
     }
+  }, {
+    "path": "pages/work/OrderManager/index",
+    "style": {
+      "navigationBarTitleText": "订单管理"
+    }
   }, {
     "path": "pages/work/BusinessApproval/index",
     "style": {
@@ -100,6 +105,16 @@
       "style": {
         "navigationBarTitleText": "订单审批详情"
       }
+    },{
+      "path": "pages/work/OrderManager/components/OrderDetail",
+      "style": {
+        "navigationBarTitleText": "订单管理详情"
+      }
+    },{
+      "path": "pages/work/OrderManager/components/NewAdd",
+      "style": {
+        "navigationBarTitleText": "新增订单"
+      }
     }],
 	
   "tabBar": {
diff --git a/pages/work/OrderApproval/OrderDetail.vue b/pages/work/OrderApproval/OrderDetail.vue
index bcaf354..ac8d8ea 100644
--- a/pages/work/OrderApproval/OrderDetail.vue
+++ b/pages/work/OrderApproval/OrderDetail.vue
@@ -34,41 +34,10 @@
 			  	<uni-col :span="12">
 			  	  <view class="label">联系方式:{{ contract.ispaynow }}</view>
 			  	</uni-col>
-			    </uni-row>
-				<uni-row class="info-grid">
-					<uni-col :span="12">
-					  <view class="label required">*执行月份:</view>
-					  <view class="select-container">
-					    <uni-data-select
-					      v-model="executionMonth"
-					      :localdata="monthOptions"
-					      popup-class="month-popup"
-					    ></uni-data-select>
-					  </view>
-					</uni-col>
-					<uni-col :span="12">
-					  <view class="label">折后订单金额:{{ contract.piaokous }}</view>
-					</uni-col>
-				  </uni-row>
-				<uni-row class="info-grid">
-					<uni-col :span="12">
-					  <view class="label">本月商务额度:{{ contract.contractmoney }}</view>
-					</uni-col>
-					<uni-col :span="12">
-					  <view class="label">本月商务可用:{{ contract.contractmoney }}</view>
-					</uni-col>
-				  </uni-row>
-				<uni-row class="info-grid">
-					<uni-col :span="12">
-					  <view class="label">本月大区额度:{{ contract.contractmoney }}</view>
-					</uni-col>
-					<uni-col :span="12">
-					  <view class="label">本月大区可用:{{ contract.contractmoney }}</view>
-					</uni-col>
-				  </uni-row>
+			    </uni-row>	
 				  <uni-row class="info-grid">
 				  	<uni-col :span="12">
-					  <view class="label">收货地址:{{ contract.place }}</view>
+					  <view class="label">发货仓库:{{ contract.place }}</view>
 					</uni-col>
 				  	
 				    </uni-row>
@@ -97,19 +66,19 @@
           </view>
           
           <view class="goods-content">
-            <!-- 件装数和供应参考价在一行 -->
+           
             <uni-row class="info-row">
               <uni-col :span="12" class="info-pair">
                 <view class="label">件装数:{{  goods.packingnum }}</view>
                 <!-- <view class="value">{{ goods.packCount }}</view> -->
               </uni-col>
               <uni-col :span="12" class="info-pair">
-                <view class="label">供应参考价:{{  goods.invoiceprice }}</view>
+                <view class="label">单价:{{  goods.invoiceprice }}</view>
                 <!-- <view class="value">{{ goods.referencePrice }}</view> -->
               </uni-col>
             </uni-row>
 
-            <!-- 前三月平均数和采购数量在一行 -->
+           
             <uni-row class="info-row">
               <uni-col :span="12" class="info-pair">
                 <view class="label">前三月平均数:{{ goods.mon3 }}</view>
@@ -121,26 +90,17 @@
               </uni-col>
             </uni-row>
 
-            <!-- 小计和使用票扣在一行 -->
+           
             <uni-row class="info-row">
               <uni-col :span="12" class="info-pair">
-                <view class="label">小计:{{ goods.allmoney }}</view>
+                <view class="label">可分配数:{{ goods.allmoney }}</view>
                 <!-- <view class="value total">{{ goods.subtotal }}</view> -->
               </uni-col>
               <uni-col :span="12" class="info-pair">
-                <view class="label">使用票扣:{{ goods.piaokou }}</view>
+                <view class="label">要求补差:{{ goods.piaokou }}</view>
                 <!-- <view class="value">{{ goods.ticketDeduction }}</view> -->
               </uni-col>
             </uni-row>
-
-            <!-- 税率单独一行 -->
-            <uni-row class="info-row">
-              <uni-col :span="12" class="info-pair">
-                <view class="label">税率:{{ goods.taxrate }}</view>
-                <!-- <view class="value">{{ goods.taxRate }}</view> -->
-              </uni-col>
-              <uni-col :span="12" class="info-pair empty"></uni-col>
-            </uni-row>
           </view>
         </view>
       </view>
@@ -148,8 +108,9 @@
 
     <!-- 操作按钮 -->
     <view class="action-buttons">
-      <button @click="goBack" class="btn btn-secondary">回退</button>
-      <button @click="review" class="btn btn-primary">审核</button>
+      <button @click="goBack" class="btn btn-secondary">审核回退</button>
+      <button @click="review" class="btn btn-primary">审核通过</button>
+	   <button @click="review" class="btn btn-primary">强制推送OA</button>
     </view>
   </view>
 </template>
diff --git a/pages/work/OrderManager/components/NewAdd.vue b/pages/work/OrderManager/components/NewAdd.vue
new file mode 100644
index 0000000..de00ac7
--- /dev/null
+++ b/pages/work/OrderManager/components/NewAdd.vue
@@ -0,0 +1,814 @@
+<template>
+  <view class="order-detail-container">
+    <!-- 基础信息区域 -->
+
+    <view class="info-section">
+      <uni-row class="info-grid">
+        <uni-col class="flex-row">
+          <view class="label">生产单位: </view>
+          <uni-data-select
+               v-model="form.companyId"
+               :localdata="companyOptions"
+               text-field="deptName"        
+               value-field="deptId"        
+               @change="getEdu"      
+               :clear="true"
+             />
+        </uni-col>
+      </uni-row>
+      <uni-row class="info-grid">
+        <uni-col :span="12">
+          <view class="label">剩余金额:{{ remainingMoney}}</view>
+        </uni-col>
+        <uni-col :span="12">
+          <view class="label">订单金额:{{ orderAmount }}</view>
+        </uni-col>
+      </uni-row>
+      <uni-row class="info-grid">
+        <uni-col :span="24" style="display: flex;">
+          <view class="label">已选补差:</view>
+		  <view class="">
+		  	<view style="color: red;" v-if="buchaGoodsList.length&&selectedBuCha.length==0">
+		  		 提示:当前有补差数据可选择
+		  	</view>
+		  
+		  <view v-else class="" v-for="(item,index) in selectedBuCha"  :key="index">
+		  	商品：{{item.goodsname}},金额：{{item.piaokou}}
+		  </view>
+		  </view>
+        </uni-col>
+      </uni-row>
+      <button type="primary" @click="toShowBucha" v-show="buChaButState">选择补差</button>
+    </view>
+
+	<!-- 补差列表 -->
+  <view class="" v-if="ShowBucha">
+    <!-- 商品信息区域 -->
+    <view class="goods-section">
+      <view class="section-title">
+		  <view class="">
+		  	补差商品信息
+		  </view>
+	   <view class="select-all">
+	          <checkbox 
+			  :checked="allSelected" 
+			  @click="toggleSelectAll" 
+			 ></checkbox>
+	        </view>
+	  </view>
+      <view v-if="buchaGoodsList.length === 0" class="no-data">
+        暂无商品数据
+      </view>
+
+      <view v-else class="goods-double-column">
+	   <checkbox-group @change="checkboxChange">		
+        <view 
+          v-for="(goods, index) in buchaGoodsList" 
+          :key="goods.piaokouid" 
+          class="goods-item"
+        >
+          <view class="goods-header">
+           
+              <text class="serial-number">{{ index + 1 }}</text>
+              <text class="goods-name">{{ goods.goodsname }}</text>
+			   <checkbox :checked="selectedList.includes(goods.piaokouid)" :value="goods.piaokouid">
+			   </checkbox>
+           
+          </view>
+          
+          <view class="goods-content">
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">申请日期:{{  goods.applydate }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">补差类型:{{  goods.piaokoutype }}</view>
+              </uni-col>
+            </uni-row>
+
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">商品简称:{{ goods.shortname }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">可补差金额:{{ goods.piaokou }}</view>
+              </uni-col>
+            </uni-row>
+			
+          </view>
+        </view>
+		</checkbox-group>
+      </view>
+    </view>
+	<!-- 操作按钮 -->
+	<view class="action-buttons">
+	  <button @click="goAdd" class="btn btn-secondary">添加</button>
+	  <button @click="goCancel" class="btn btn-primary">取消</button>
+	</view>
+	 </view>
+	
+  <view v-else>
+    <!-- 商品信息区域 -->
+    <view class="goods-section">
+      <view class="section-title">
+    	  <view class="">
+    	  	商品信息
+    	  </view>
+
+      </view>
+      <view v-if="goodsList.length === 0" class="no-data">
+        暂无商品数据
+      </view>
+    
+      <view v-else class="goods-double-column">
+        <view 
+          v-for="(goods, index) in goodsList"
+          :key="goods.goodsid"
+          class="goods-item"
+        >
+          <view class="goods-header">
+           
+              <text class="serial-number">{{ index + 1 }}</text>
+              <text class="goods-name">{{ goods.goodsname }}</text>
+    		 
+           
+          </view>
+          
+          <view class="goods-content">
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">件装数:{{  goods.packingnum }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">供应参考价:{{  goods.invoiceprice }}</view>
+              </uni-col>
+            </uni-row>
+    
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">前三月平均数:{{ goods.threeMonths }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">使用票扣:{{ goods.piaokou }}</view>
+              </uni-col>
+            </uni-row>
+    
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">小计:{{ goods.allmoney }}</view>
+              </uni-col>
+             <uni-col :span="12" class="info-pair">
+               <view class="label">税率:{{ goods.taxrate }}</view>
+             </uni-col>
+            </uni-row>
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair flex-row" >
+                <view class="label">采购数量:</view>
+                <input
+                  class="uni-input custom-input"
+                  v-model="goods.goodsnum"
+                  placeholder="请输入采购数量"
+                  @confirm="e =>handleInput(e,index)"/>
+              </uni-col>
+            </uni-row>
+    		
+          </view>
+        </view>
+      </view>
+    </view>
+	<!-- 操作按钮 -->
+	<view class="action-buttons">
+	  <button @click="goSave" class="btn btn-secondary">保存</button>
+	  <button @click="goSubmit" class="btn btn-primary">确认提交</button>
+	</view>
+	 </view>
+   
+  </view>
+</template>
+
+<script setup>
+	
+import { onMounted, ref ,computed} from 'vue'
+import { contractData, goodsData } from '../detailData.js'
+import { listsaleBusGoodsList } from '../../../../api/orderManager/index.js'
+import { listproductList } from '../../../../api/orderManager/index.js'
+// import { getInfo } from '../../../../store/modules/user.js'
+import { useUserStore } from '../../../../store/modules/user.js'
+import data1 from './data1.js'
+//已选补差
+const selectedBuCha = ref([])
+// 商品列表数据
+const buchaGoodsList =ref([])
+const goodsList = ref([])
+const form = ref({
+	companyId:'1',
+})
+const RemainingMoney = ref('0.00') // 剩余金额
+//显示补差按钮
+const buChaButState = ref(true)
+//显示选中所有按钮
+const allSelected = ref(false)
+//储存选中的列表
+const selectedList = ref([])
+//显示补差
+const ShowBucha = ref(false)
+//剩余金额
+const remainingMoney = ref(0)
+//订单金额
+const orderAmount = ref(0.00)
+// 入参
+const queryNum = ref({})
+// 基础信息
+const contract = ref({})
+// 生产单位
+const companyOptions = ref([])
+const monthOptions = ref([
+  { value: 0, text: '本月执行' },
+  { value: 1, text: '下月执行' }
+])
+// // 通用的金额格式化函数
+// const formatMoney = (value) => {
+//   const num = Number(value)
+//   return isNaN(num) 
+//     ? '0.00' 
+//     : num.toLocaleString('en-US', {
+//         minimumFractionDigits: 2,
+//         maximumFractionDigits: 2
+//       })
+// }
+// // 创建计算属性（可选）
+// const formattedRemainingMoney = computed(() => formatMoney(RemainingMoney.value))
+// const formattedContractMoney = computed(() => formatMoney(form.value.contractmoney))
+
+onMounted(() => {
+  // contract.value = contractData.data[0]
+  // console.log(contract.value)
+  buchaGoodsList.value = data1.data
+  getDeptLists()
+  GetlistsaleBusGoodsList()
+})
+function GetlistsaleBusGoodsList() {
+  // // 查询可销售商品列表
+    const KeSaleGoodsParams ={
+        companyId:form.value.companyId,
+        // userid: useUserStore.id,暂时替换为41
+        userid: 41,
+        deleteflag:0,           //不禁用的，禁用标志 0: 不禁用 1: 禁用 2, 流程中
+        // state:1,                //状态0待审核,1已审核
+    }
+    const KeSaleGoodsQuery = {
+        pageNum: 1,
+        pageSize: 999,
+    }
+    listsaleBusGoodsList(KeSaleGoodsParams,KeSaleGoodsQuery).then(res => {
+        goodsList.value = res.data
+    });
+}
+
+
+const getDeptLists = () =>{
+  listproductList().then(res => {
+     companyOptions.value = res.data.map(item => {
+				return {
+					value:item.deptId,
+					text:item.deptName
+				}
+			})
+	  console.log('companyOptions.value', companyOptions.value)
+  });
+ 
+}
+/**
+ * 判断两个数组是否**严格相等**（顺序、值、类型都一致）
+ */
+
+function arraysEqual(a, b) {
+  return (
+    Array.isArray(a) &&
+    Array.isArray(b) &&
+    a.length === b.length &&
+    a.every((val, idx) => val === b[idx])
+  );
+}
+// 操作方法
+const checkboxChange = (value) =>{
+	// console.log("value",value)
+	let idList = value.detail.value
+	let compareList = []
+	selectedList.value = idList//对比列表
+	selectedBuCha.value = []
+	let temp =true
+	idList.forEach(item =>{
+		
+		buchaGoodsList.value.forEach(item1 =>{
+			
+			if( temp ){
+			compareList.push(item1.piaokouid)
+			}
+			if(item1.piaokouid == item){
+				selectedBuCha.value.push(
+				{ goodsname: item1.goodsname,
+				piaokou: item1.piaokou,
+				goodsid:item1.goodsid}
+				)
+			}
+		})
+		temp =false
+	}
+	)
+	//判断是否全选中
+	console.log("111",arraysEqual(idList,compareList))
+
+	console.log("111",idList,compareList)
+    
+	if(compareList.length!==0&&idList.length!==0&&arraysEqual(idList,compareList)){
+		allSelected.value = true
+	}else{
+		allSelected.value = false
+	}
+	
+}
+/** 更改生产单位时，查询额度 */
+function getEdu() {
+    console.log(form.value.companyId,'form.value.companyId生产单位ID')
+    BuChaDataShow.value = [] // 清空已选补差数据
+    const AmountqueryParams = {
+        companyId:form.value.companyId,
+        saleId: 0,
+    }
+    // 查询剩余额度
+    getsalemaincheckAmount(AmountqueryParams).then(res => {
+        RemainingMoney.value = res.data.amounts
+    });
+    GetlistsaleBusGoodsList()
+    getsalemainpiAoKouList()
+
+}
+//选择所有列表
+const toggleSelectAll = () =>{
+	if(!allSelected.value){
+		selectedList.value = buchaGoodsList.value.map(item => item.piaokouid)
+		allSelected.value = true
+		selectedBuCha.value = []
+		buchaGoodsList.value.forEach(item1 =>{
+				selectedBuCha.value.push(
+				{ goodsname: item1.goodsname,
+				piaokou: item1.piaokou,
+				goodsid:item1.goodsid}
+				)
+			
+		})
+	}else{
+		selectedBuCha.value = []//清除已补差数据
+		selectedList.value = []//清除已选中
+		allSelected.value = false
+	}
+	console.log("value",selectedList.value)
+	console.log("value",allSelected.value)
+}
+
+//添加
+const goAdd = () =>{
+	console.log('添加！')
+	//算出每个药品的总piaokou
+	console.log('selectedBuCha.value！',selectedBuCha.value)
+	if(selectedBuCha.value.length!==0){
+		const piaoKouSum = selectedBuCha.value.reduce((acc , cur) =>{
+			  acc[cur.goodsid] = (acc[cur.goodsid]||0) + cur.piaokou
+			  return acc
+		},{})
+	   
+		console.log('piaoKouSum！',piaoKouSum)
+		goodsList.value.forEach( item =>{
+			  if(piaoKouSum[item.goodsid] !== undefined){
+				  item.piaokou = piaoKouSum[item.goodsid]
+			  }
+		})
+		
+	}else{
+		uni.showToast({
+		  title: '没有选择数据!',
+		  icon: 'none',
+		  duration: 2000
+		});
+		return
+	}
+	
+	uni.showToast({
+	  title: '添加成功!',
+	  icon: 'success',
+	  duration: 2000
+	});
+	window.scrollTo({ top: 0, behavior: 'smooth' });
+	ShowBucha.value = false
+	buChaButState.value =true
+}
+//取消
+const goCancel = () =>{
+	ShowBucha.value = false
+	buChaButState.value =true
+	window.scrollTo({ top: 0, behavior: 'smooth' });
+	console.log('取消！')
+}
+// 计算小计
+const handleInput = (e, index) => {
+	console.log('index',index)
+  const value = e.detail.value
+  // 将输入值转为数字
+  const num = Number(value)
+  if (isNaN(num)) return // 防止非数字输入
+  // 更新采购数量
+  goodsList.value[index].goodsnum = num
+  // 重新计算小计 = 采购数量 × 供应参考价
+  goodsList.value[index].allmoney = num * goodsList.value[index].invoiceprice
+  //计算订单金额
+  orderAmount.value = 0
+  goodsList.value.forEach(item =>{
+	  orderAmount.value += Number(item.invoiceprice)*Number(item.goodsnum)
+  } )
+   orderAmount.value = Math.ceil(orderAmount.value * 100) / 100;
+   console.log('orderAmount',orderAmount.value)
+}
+
+const toggleSelection = (index) => {
+  goodsList.value[index].selected = !goodsList.value[index].selected;
+}
+
+const handleByCompany = (value) => {
+  console.log("value", value)
+  // 更新数据
+}
+const validatePiaokou = () => {
+  // 找出所有piaokou大于xiaoji的商品
+  const invalidItems = form.value.saledetailList.filter(
+    item => item.piaokou > item.xiaoji
+  );
+  
+  if (invalidItems.length > 0) {
+    // 构建错误提示信息
+    const errorMessage = `以下商品的票扣金额大于小计金额：\n` +
+      invalidItems.map(item => 
+        `- ${item.goodsname} (票扣: ${item.piaokou}, 小计: ${item.xiaoji})`
+      ).join('\n');
+    
+    uni.showToast({
+      title: errorMessage,
+      icon: 'none',
+      duration: 3000
+    });
+    return false;
+  }
+  
+  return true;
+};
+const goSave = () => {
+  console.log("回退操作")
+  // 成功提示 (类似 ElMessage.success)
+  const tableData =goodsList.value;
+      const filteredData = tableData.filter(item => 
+          item.goodsnum !== null && 
+          item.goodsnum !== '' && 
+          item.goodsnum !== 0 && 
+          !isNaN(item.goodsnum)
+      );
+      form.value.saledetailList = filteredData
+       form.value.saledetailList = form.value.saledetailList.map(item => ({
+          ...item,
+          price:item.invoiceprice,
+          xiaoji:item.allmoney
+      }));
+      // 添加验证
+    if (!validatePiaokou()) {
+      return; // 验证不通过，停止执行
+    }
+	
+      form.value.state = 0 // 0为保存，可修改编辑，1的时候为提交，
+	  //提交
+     console.log(" form.value.state", form.value)
+  uni.showToast({
+    title: '保存成功!',
+    icon: 'success',
+    duration: 2000
+  });
+}
+const goSubmit = () => {
+  console.log("审核操作")
+ 
+ 
+  uni.showToast({
+    title: '审核成功！',
+    icon: 'success',
+    duration: 2000
+  });
+}
+
+const toShowBucha = () => {
+	ShowBucha.value = true
+	buChaButState.value =false
+  console.log("选择补差")
+}
+</script>
+
+<style lang="scss" scoped>
+	// ::v-deep .uni-checkbox-input {
+	//   background-color: #fff !important;
+	//   border-color: #67c23a !important;
+	// }
+	
+	// ::v-deep .uni-checkbox-input-checked {
+	//   background-color: #fff !important;
+	//   color: #67c23a !important; /* 对号颜色 */
+	
+	// }
+	// ::v-deep .uni-checkbox-input svg{
+	// 	  viewBox: 0 0 36 36;
+	// 	  width: 22rpx;
+	// 	  height: 22rpx;
+	//   }
+	.select-all {
+		//靠右显示
+		margin-left: auto;
+		// margin-left: 10rpx;
+		// background-color: #67c23a;
+	}
+.custom-input {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  padding: 5px;
+  height: 25px;
+}
+.order-detail-container {
+  padding: 16px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+.flex-row {
+  display: flex;
+  align-items: center; /* 垂直居中对齐 */
+  gap: 10px; /* 标签和下拉框之间的间距 */
+}
+
+.page-title {
+  text-align: center;
+  margin-bottom: 24px;
+  color: #333;
+  font-size: 18px;
+  font-weight: 600;
+  padding: 12px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+/* 基础信息网格布局 */
+.info-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.info-grid {
+  :deep(.uni-row) {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .info-value {
+    font-size: 15px;
+    color: #333;
+    font-weight: 500;
+    display: flex;
+    justify-content: flex-end;
+  }
+  
+  margin-bottom: 20rpx;
+  margin-top: 20rpx;
+}
+
+.info-item {
+  margin-bottom: 12px;
+}
+
+.label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 4px;
+  font-weight: 500;
+}
+
+.required::after {
+  content: '*';
+  color: #f56c6c;
+  margin-left: 2px;
+}
+
+.amount {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.select-container {
+  width: 100%;
+}
+
+:deep(.uni-data-select__text) {
+  padding: 8px 12px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+:deep(.month-popup) {
+  min-width: 120px;
+}
+
+/* 商品信息区域 */
+.goods-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.section-title {
+  font-size: 16px;
+  color: #333;
+  margin: 0 0 16px 0;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+}
+
+.no-data {
+  text-align: center;
+  color: #999;
+  padding: 40px 0;
+  font-size: 14px;
+}
+
+/* 商品双栏布局 */
+.goods-double-column {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.goods-item {
+  border: 1px solid #eee;
+  border-radius: 12px;
+  overflow: hidden;
+  background: #fafafa;
+}
+
+.goods-header {
+  background: #409eff;
+  color: white;
+  padding: 10px 16px;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.serial-number {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.goods-name {
+  font-size: 15px;
+  font-weight: 600;
+  flex: 1;
+}
+
+/* 商品内容区域 */
+.goods-content {
+  padding: 12px 16px;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.info-pair {
+  flex: 1;
+  padding: 0 8px;
+}
+
+.info-pair .label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 2px;
+}
+
+.info-pair .value {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  text-align: right;
+}
+
+.quantity {
+  color: #409eff;
+  font-weight: 600;
+}
+
+.total {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.empty {
+  visibility: hidden;
+}
+
+/* 操作按钮 */
+.action-buttons {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+  padding: 16px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.btn {
+  padding: 12px 24px;
+  border: none;
+  border-radius: 8px;
+  font-size: 15px;
+  font-weight: 500;
+  cursor: pointer;
+  min-width: 80px;
+  text-align: center;
+  flex: 1;
+}
+
+.btn-primary {
+  background: #409eff;
+  color: white;
+}
+
+.btn-secondary {
+  background: #67c23a;
+  color: white;
+}
+
+.btn-outline {
+  background: #fff;
+  color: #333;
+  border: 1px solid #ddd;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .order-detail-container {
+    padding: 12px;
+  }
+
+  .info-item {
+    margin-bottom: 10px;
+  }
+
+  .info-pair {
+    padding: 0 4px;
+  }
+
+  .action-buttons {
+    flex-direction: column;
+  }
+
+  .btn {
+    width: 100%;
+    margin-bottom: 8px;
+  }
+
+  .btn:last-child {
+    margin-bottom: 0;
+  }
+}
+
+/* 添加多选框样式 */
+.uni-checkbox {
+  display: inline-flex;
+  align-items: center;
+  margin-right: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/work/OrderManager/components/OrderDetail.vue b/pages/work/OrderManager/components/OrderDetail.vue
new file mode 100644
index 0000000..f4b46b7
--- /dev/null
+++ b/pages/work/OrderManager/components/OrderDetail.vue
@@ -0,0 +1,449 @@
+<template>
+ <view class="order-detail-container">
+    <!-- <view class="page-title">查看详细信息</view> -->
+
+    <!-- 基础信息区域 -->
+    <view class="info-section">
+      <uni-row class="info-grid">
+		  <uni-col >
+          <view class="label">商业公司: {{contract.user_name}} </view>
+		</uni-col>
+		
+		</uni-row>
+		<uni-row class="info-grid">
+			<uni-col :span="12">
+			  <view class="label">制单日期:{{ contract.adddate}}</view>
+			</uni-col>
+			<uni-col :span="12">
+			  <view class="label">合同编号:{{ contract.contractcode }}</view>
+			</uni-col>
+          </uni-row>
+		  <uni-row class="info-grid">
+		  	<uni-col :span="12">
+		  	  <view class="label">订单金额:{{ contract.contractmoney }}</view>
+		  	</uni-col>
+		  	<uni-col :span="12">
+		  	  <view class="label">补差金额:{{ contract.user_name }}</view>
+		  	</uni-col>
+		    </uni-row>
+
+			  <uni-row class="info-grid">
+			  	<uni-col :span="12">
+			  	  <view class="label">支付方式:{{ contract.ispaynow }}</view>
+			  	</uni-col>
+			  	<uni-col :span="12">
+			  	  <view class="label">联系方式:{{ contract.ispaynow }}</view>
+			  	</uni-col>
+			    </uni-row>	
+				  <uni-row class="info-grid">
+				  	<uni-col :span="12">
+					  <view class="label">发货仓库:{{ contract.place }}</view>
+					</uni-col>
+				  	
+				    </uni-row>
+		
+	     
+      
+    </view>
+
+    <!-- 商品信息区域 -->
+    <view class="goods-section">
+      <view class="section-title">商品信息</view>
+      
+      <view v-if="goodsList.length === 0" class="no-data">
+        暂无商品数据
+      </view>
+
+      <view v-else class="goods-double-column">
+        <view 
+          v-for="(goods, index) in goodsList" 
+          :key="index" 
+          class="goods-item"
+        >
+          <view class="goods-header">
+            <text class="serial-number">{{ index + 1 }}</text>
+            <text class="goods-name">{{ goods.goodsname }}</text>
+          </view>
+          
+          <view class="goods-content">
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">件装数:{{  goods.packingnum }}</view>
+                <!-- <view class="value">{{ goods.packCount }}</view> -->
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">单价:{{  goods.invoiceprice }}</view>
+                <!-- <view class="value">{{ goods.referencePrice }}</view> -->
+              </uni-col>
+            </uni-row>
+
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">前三月平均数:{{ goods.mon3 }}</view>
+                <!-- <view class="value">{{ goods.average }}</view> -->
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">采购数量:{{ goods.goodsnum }}</view>
+                <!-- <view class="value quantity">{{ goods.quantity }}</view> -->
+              </uni-col>
+            </uni-row>
+
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">可分配数:{{ goods.allmoney }}</view>
+                <!-- <view class="value total">{{ goods.subtotal }}</view> -->
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">要求补差:{{ goods.piaokou }}</view>
+                <!-- <view class="value">{{ goods.ticketDeduction }}</view> -->
+              </uni-col>
+            </uni-row>
+          </view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 操作按钮 -->
+    <view class="action-buttons">
+      <button @click="goBack" class="btn btn-secondary">审核回退</button>
+      <button @click="review" class="btn btn-primary">审核通过</button>
+	   <button @click="review" class="btn btn-primary">强制推送OA</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+import { onMounted, ref } from 'vue'
+import { contractData,goodsData } from '../detailData.js'
+
+// 基础信息
+const contract = ref({})
+
+const monthOptions = ref([
+  { value: 0, text: '本月执行' },
+  { value: 1, text: '下月执行' }
+])
+onMounted(()=>{
+	contract.value = contractData.data[0]
+	console.log(contract.value)
+	goodsList.value = goodsData.data
+	
+	
+})
+// 商品列表数据
+const goodsList = ref([
+  {
+    name: '商品A',
+    packCount: '12',
+    referencePrice: '88.00',
+    average: '150',
+    quantity: '1000',
+    subtotal: '88,000.00',
+    ticketDeduction: '是',
+    taxRate: '13%'
+  },
+  {
+    name: '商品B',
+    packCount: '24',
+    referencePrice: '18.00',
+    average: '800',
+    quantity: '1200',
+    subtotal: '21,600.00',
+    ticketDeduction: '否',
+    taxRate: '13%'
+  }
+])
+
+// 操作方法
+const goBack = () => {
+  console.log("回退操作")
+  // 成功提示 (类似 ElMessage.success)
+  uni.showToast({
+    title: '回退成功!',
+    icon: 'success',
+    duration: 2000
+  });
+}
+
+const review = () => {
+  console.log("审核操作")
+  // 成功提示 (类似 ElMessage.success)
+  uni.showToast({
+    title: '审核成功！',
+    icon: 'success',
+    duration: 2000
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.order-detail-container {
+  padding: 16px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+
+.page-title {
+  text-align: center;
+  margin-bottom: 24px;
+  color: #333;
+  font-size: 18px;
+  font-weight: 600;
+  padding: 12px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+/* 基础信息网格布局 */
+.info-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.info-grid {
+  :deep(.uni-row) {
+    display: flex;
+    flex-wrap: wrap;
+	
+  }
+  .info-value {
+    font-size: 15px;
+    color: #333;
+    font-weight: 500;
+     display: flex;
+     justify-content: flex-end;
+    
+  }
+  
+  margin-bottom: 20rpx;
+  margin-top: 20rpx;
+}
+
+.info-item {
+  margin-bottom: 12px;
+}
+
+.label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 4px;
+  font-weight: 500;
+}
+
+.required::after {
+  content: '*';
+  color: #f56c6c;
+  margin-left: 2px;
+}
+
+// .info-value {
+//   font-size: 15px;
+//   color: #333;
+//   font-weight: 500;
+//   display: flex;
+//   justify-content: flex-end;
+  
+// }
+
+.amount {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.select-container {
+  width: 100%;
+}
+
+:deep(.uni-data-select__text) {
+  padding: 8px 12px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+:deep(.month-popup) {
+  min-width: 120px;
+}
+
+/* 商品信息区域 */
+.goods-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.section-title {
+  font-size: 16px;
+  color: #333;
+  margin: 0 0 16px 0;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+}
+
+.no-data {
+  text-align: center;
+  color: #999;
+  padding: 40px 0;
+  font-size: 14px;
+}
+
+/* 商品双栏布局 */
+.goods-double-column {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.goods-item {
+  border: 1px solid #eee;
+  border-radius: 12px;
+  overflow: hidden;
+  background: #fafafa;
+}
+
+.goods-header {
+  background: #409eff;
+  color: white;
+  padding: 10px 16px;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.serial-number {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  background: rgba(255,255,255,0.2);
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.goods-name {
+  font-size: 15px;
+  font-weight: 600;
+  flex: 1;
+}
+
+/* 商品内容区域 */
+.goods-content {
+  padding: 12px 16px;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.info-pair {
+  flex: 1;
+  padding: 0 8px;
+}
+
+.info-pair .label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 2px;
+}
+
+.info-pair .value {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  text-align: right;
+}
+
+.quantity {
+  color: #409eff;
+  font-weight: 600;
+}
+
+.total {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.empty {
+  visibility: hidden;
+}
+
+/* 操作按钮 */
+.action-buttons {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+  padding: 16px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.btn {
+  padding: 12px 24px;
+  border: none;
+  border-radius: 8px;
+  font-size: 15px;
+  font-weight: 500;
+  cursor: pointer;
+  min-width: 80px;
+  text-align: center;
+  flex: 1;
+}
+
+.btn-primary {
+  background: #409eff;
+  color: white;
+}
+
+.btn-secondary {
+  background: #67c23a;
+  color: white;
+}
+
+.btn-outline {
+  background: #fff;
+  color: #333;
+  border: 1px solid #ddd;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .order-detail-container {
+    padding: 12px;
+  }
+
+  .info-item {
+    margin-bottom: 10px;
+  }
+
+  .info-pair {
+    padding: 0 4px;
+  }
+
+  .action-buttons {
+    flex-direction: column;
+  }
+
+  .btn {
+    width: 100%;
+    margin-bottom: 8px;
+  }
+
+  .btn:last-child {
+    margin-bottom: 0;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/pages/work/OrderManager/components/data1.js b/pages/work/OrderManager/components/data1.js
new file mode 100644
index 0000000..a47c85f
--- /dev/null
+++ b/pages/work/OrderManager/components/data1.js
@@ -0,0 +1,113 @@
+// buchadata.js
+export default {
+  data: [
+    {
+      piaokouid: 1,
+      goodsid: 1, // 对应盐酸丙卡特罗片(美普清)10
+      applydate: "2024-01-15",
+      piaokoutype: "价格补差",
+      shortname: "MPT10",
+      goodsname: "盐酸丙卡特罗片(美普清)10",
+      piaokou: 100
+    },
+    {
+      piaokouid: 101,
+      goodsid: 1, // 对应盐酸丙卡特罗片(美普清)10
+      applydate: "2025-11-15",
+      piaokoutype: "价格补差",
+      shortname: "MPT10",
+      goodsname: "盐酸丙卡特罗片(美普清)10",
+      piaokou: 200
+    },
+    {
+      piaokouid: 2,
+      goodsid: 3, // 对应盐酸丙卡特罗片(美普清)20
+      applydate: "2024-01-16",
+      piaokoutype: "运费补差",
+      shortname: "MPT20",
+      goodsname: "盐酸丙卡特罗片(美普清)20",
+      piaokou: 8.00
+    },
+    {
+      piaokouid: 3,
+      goodsid: 5, // 对应瑞巴派特片(膜固思达)24
+      applydate: "2024-01-17",
+      piaokoutype: "促销补差",
+      shortname: "MCT24",
+      goodsname: "瑞巴派特片(膜固思达)24",
+      piaokou: 12.80
+    },
+    {
+      piaokouid: 4,
+      goodsid: 35, // 对应瑞巴派特片(膜固思达)48
+      applydate: "2024-01-18",
+      piaokoutype: "价格补差",
+      shortname: "MCT48",
+      goodsname: "瑞巴派特片(膜固思达)48",
+      piaokou: 25.00
+    },
+    {
+      piaokouid: 5,
+      goodsid: 6, // 对应阿立哌唑片(安律凡)5mg
+      applydate: "2024-01-19",
+      piaokoutype: "运费补差",
+      shortname: "ABF5",
+      goodsname: "阿立哌唑片(安律凡)5mg",
+      piaokou: 18.50
+    },
+    {
+      piaokouid: 6,
+      goodsid: 8, // 对应托伐普坦片(苏麦卡)
+      applydate: "2024-01-20",
+      piaokoutype: "促销补差",
+      shortname: "SMC",
+      goodsname: "托伐普坦片(苏麦卡)",
+      piaokou: 45.75
+    },
+    {
+      piaokouid: 7,
+      goodsid: 10, // 对应白消安注射液(白舒非)
+      applydate: "2024-01-21",
+      piaokoutype: "价格补差",
+      shortname: "BSF",
+      goodsname: "白消安注射液(白舒非)",
+      piaokou: 120.25
+    },
+    {
+      piaokouid: 8,
+      goodsid: 33, // 对应德拉马尼片(德尔巴)
+      applydate: "2024-01-22",
+      piaokoutype: "运费补差",
+      shortname: "DLM",
+      goodsname: "德拉马尼片(德尔巴)",
+      piaokou: 280.00
+    },
+    {
+      piaokouid: 9,
+      goodsid: 39, // 对应注射用阿立哌唑0.4g
+      applydate: "2024-01-23",
+      piaokoutype: "促销补差",
+      shortname: "AOM400",
+      goodsname: "注射用阿立哌唑0.4g",
+      piaokou: 95.90
+    },
+    {
+      piaokouid: 10,
+      goodsid: 41, // 对应布瑞哌唑片(锐思定)1mg
+      applydate: "2024-01-24",
+      piaokoutype: "价格补差",
+      shortname: "RXT1",
+      goodsname: "布瑞哌唑片(锐思定)1mg",
+      piaokou: 22.40
+    },
+    {
+      piaokouid: 11,
+      goodsid: 42, // 对应泊那替尼片（英可欣）15mg
+      applydate: "2024-01-25",
+      piaokoutype: "运费补差",
+      shortname: "ISG",
+      goodsname: "泊那替尼片（英可欣）15mg",
+      piaokou: 350.60
+    }
+  ]
+};
\ No newline at end of file
diff --git a/pages/work/OrderManager/data.js b/pages/work/OrderManager/data.js
new file mode 100644
index 0000000..2464c2a
--- /dev/null
+++ b/pages/work/OrderManager/data.js
@@ -0,0 +1,49 @@
+// staticData.js
+export const contractData = {
+    "total": 2,
+    "rows": [
+        {
+            "saleid": 999822,
+            "adddate": "2025-08-20 09:05:26",
+            "contractcode": "Z-CQ-000120",
+            "contractmoney": 5767.4700,
+            "usernames": "重庆医药集团医贸药品有限公司",
+            "businessManagerName": "商务经理名字-西区",
+            "transport": "汽运",
+            "areaName": "重庆",
+            "warehouseName": "临安GSP库",
+            "companyName": "浙江大冢制药有限公司",
+            "stateText": "待商务审批",
+            "bigAreaName": "西区"
+        },
+		{
+		    "saleid": 999833,
+		    "adddate": "2025-08-20 09:05:26",
+		    "contractcode": "Z-CQ-000120",
+		    "contractmoney": 5767.4700,
+		    "usernames": "重庆医药集团医贸药品有限公司",
+		    "businessManagerName": "商务经理名字-西区",
+		    "transport": "汽运",
+		    "areaName": "重庆",
+		    "warehouseName": "临安GSP库",
+		    "companyName": "浙江大冢制药有限公司",
+		    "stateText": "待商务审批",
+		    "bigAreaName": "西区"
+		},
+        {
+            "saleid": 166314,
+            "adddate": "2025-07-08 15:09:20",
+            "contractcode": "G-SC-40861",
+            "contractmoney": 109296.0000,
+            "usernames": "国药集团西南医药有限公司",
+            "transport": "汽运",
+            "areaName": "四川",
+            "warehouseName": "广东三方(上药)",
+            "companyName": "广东大冢制药有限公司",
+            "stateText": "待商务审批",
+            "bigAreaName": "西区"
+        }
+    ],
+    "code": 200,
+    "msg": "查询成功"
+};
\ No newline at end of file
diff --git a/pages/work/OrderManager/detail.vue b/pages/work/OrderManager/detail.vue
new file mode 100644
index 0000000..9783562
--- /dev/null
+++ b/pages/work/OrderManager/detail.vue
@@ -0,0 +1,34 @@
+<template>
+	<view class="container">
+		详情{{saleid}}
+	</view>
+</template>
+
+	<script setup>
+	import { ref, onMounted } from 'vue'
+	import { onLoad } from '@dcloudio/uni-app'
+	
+	const saleid = ref('')
+	
+	onLoad((options) => {
+	    if (options.saleid) {
+	        saleid.value = options.saleid
+	        // 这里可以根据saleid请求详情数据
+			console.log('加载合同详情，ID:', saleid.value)
+	        // loadContractDetail(saleid.value)
+	    }
+	})
+	
+	function loadContractDetail(id) {
+	    // 根据saleid请求详情数据的逻辑
+	    console.log('加载合同详情，ID:', id)
+	}
+	</script>
+
+<style scoped>
+	.container {
+		padding: 10px;
+		background-color: #f5f7fa;
+		min-height: 100vh;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/work/OrderManager/detailData.js b/pages/work/OrderManager/detailData.js
new file mode 100644
index 0000000..ec2fd89
--- /dev/null
+++ b/pages/work/OrderManager/detailData.js
@@ -0,0 +1,72 @@
+// staticData.js
+export const contractData = {
+    "total": 2,
+    "data": [
+        {
+                    "saleid": 999822,
+                    "user_name": "重庆医药集团医贸药品有限公司",
+                    "phonenumber": "",
+                    "budgetmoney_area": 0.0000,
+                    "ispaynow": "非现款",
+                    "contractcode": "Z-CQ-000120",
+                    "piaokous": 5767.4700,
+                    "budgetmoney1": 0.0000,
+                    "CAN": 0.0000,
+                    "ContractMoney1": 0.00,
+                    "contractmoney": 5767.4700,
+                    "ContractMoney_area": 0.00,
+                    "CAN_area": 0.0000,
+                    "place": "重庆市沙坪坝区土主镇明珠山一支路4号",
+                    "piaokou": 0.0000,
+                    "dept_id": 1,
+                    "shortName": "重庆医贸",
+                    "adddate": "2025-08-20"
+                },
+		
+    ],
+    "code": 200,
+    "msg": "查询成功"
+};
+export const goodsData = 
+	{
+	    "msg": "操作成功",
+	    "code": 200,
+	    "data": [
+	        {
+	            "taxrate": 1.00,
+	            "mon3": 0.0000,
+	            "packingnum": 200,
+	            "invoiceprice": 46.8900,
+	            "goodsname": "盐酸丙卡特罗片(美普清)10",
+	            "piaokou": 0.0000,
+	            "goodsnum": 123,
+	            "allmoney": 5767.4700,
+	            "shortname": "MPT10",
+				"num":0
+	        },
+			{
+			    "taxrate": 2.00,
+			    "mon3": 0.0000,
+			    "packingnum": 200,
+			    "invoiceprice": 46.8900,
+			    "goodsname": "诺氟沙星(美普清)10",
+			    "piaokou": 0.0000,
+			    "goodsnum": 123,
+			    "allmoney": 5767.4700,
+			    "shortname": "MPT10",
+				"num":0
+			},
+			{
+			    "taxrate": 3.00,
+			    "mon3": 0.0000,
+			    "packingnum": 200,
+			    "invoiceprice": 46.8900,
+			    "goodsname": "盐酸宁干片(美普清)10",
+			    "piaokou": 0.0000,
+			    "goodsnum": 123,
+			    "allmoney": 5767.4700,
+			    "shortname": "MPT10",
+				"num":0
+			}
+	    ]
+	}
diff --git a/pages/work/OrderManager/index.vue b/pages/work/OrderManager/index.vue
new file mode 100644
index 0000000..1f12be7
--- /dev/null
+++ b/pages/work/OrderManager/index.vue
@@ -0,0 +1,296 @@
+<template>
+	<view class="container">
+		<view class="example">
+			<uni-forms ref="baseForm" :modelValue="baseFormData" label-width="20vw">
+				
+				<uni-forms-item label="生产单位">
+					 <uni-data-select
+					      v-model="queryParams.CompanyId"
+					      :localdata="companyOptions"
+					      text-field="deptName"        
+					      value-field="deptId"        
+					      @change="getTableData"      
+					      :clear="true"               
+					      
+					    />
+				</uni-forms-item>
+				<uni-forms-item label="状态">
+					<uni-data-select
+						  v-model="queryParams.state" 
+						  :localdata="stateList"
+						  @change="getTableData" 
+					       :clear="true"
+					></uni-data-select>
+				</uni-forms-item>
+				<uni-forms-item label="合同编号" >
+					<input
+					  class="uni-input custom-input"
+					  v-model="queryParams.contractcode"
+					  placeholder="请输入合同编号"
+					  @confirm="getTableData"/>
+				</uni-forms-item>
+				<!-- <uni-forms-item label="合同编号" >
+				<view class="uni-form-item uni-column">
+				<input class="uni-input" focus placeholder="自动获得焦点" />
+				</view>
+				</uni-forms-item> -->
+			</uni-forms>
+				<button type="primary" @click="gotoNewAdd">新增</button>
+		</view>
+		
+		<view v-if="filteredContracts.length === 0" class="no-data">
+			<text>暂无匹配的合同数据</text>
+		</view>
+		
+		<view v-else>
+			<uni-card 
+				v-for="(contract, index) in filteredContracts" 
+				:key="contract.saleid" 
+				:title="contract.usernames" 
+				@click="gotoDetail(contract)"
+				:class="index % 2 === 0 ? 'card-even' : 'card-odd'"
+			>
+				<uni-row class="demo-uni-row">
+					<uni-col :span="12">
+						<view class="demo-uni-col dark">生产单位: {{ contract.companyName }}</view>
+					</uni-col>
+					<uni-col :span="12">
+						<view class="demo-uni-col light">合同编号: {{ contract.contractcode }}</view>
+					</uni-col>
+				</uni-row>
+				<uni-row class="demo-uni-row">
+					<uni-col :span="12">
+						<view class="demo-uni-col dark">制单日期: {{ formatDate(contract.adddate) }}</view>
+					</uni-col>
+					<uni-col :span="12">
+						<view class="demo-uni-col light">订单金额: {{ contract.contractmoney.toFixed(2) }}</view>
+					</uni-col>
+				</uni-row>
+				<uni-row class="demo-uni-row">
+					<uni-col :span="12">
+						<view class="demo-uni-col dark">状态: {{ contract.stateText }}</view>
+					</uni-col>
+					<uni-col :span="12" style="display: flex;">
+						<view class="demo-uni-col light">订单类型: </view>
+						 <dict-tag :options="orderTypeList" :value="contract.type" style="color: red;"/>
+					</uni-col>
+				</uni-row>
+			</uni-card>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import { listsalemain } from "../../../api/orderManager/index.js"
+import { listproductList } from "../../../api/orderManager/index.js"
+import { ref, reactive, onMounted, computed,getCurrentInstance } from "vue"
+import { contractData } from "../OrderManager/data.js" // 根据实际路径调整
+import { getDicts } from "../../../api/system/dict/data.js"
+// import DictTag from '@/components/dict-tag/dict-tag.vue';
+
+// import { log } from "console"
+const { proxy } = getCurrentInstance()
+// 表单数据
+const baseFormData = ref({
+	
+})
+//订单类型
+const orderTypeList =ref([])
+const paymentValue = ref(0)
+const companyValue = ref(0)
+const paging = ref({
+    // 页码
+    pageNum: 1,
+    // 分页数量
+    pageSize:999,
+    isAsc: 'descending',
+    orderByColumn: 'adddate'
+})
+const queryParams = ref({
+    params:{
+        state: "0,1,-1,2,-2,3,-3,9,10,11,12,-12,13,-13,14,15,16",
+    }
+})
+// 筛选选项
+// const stateList = ref([
+// 	{ value: '0', text: "未提交" },
+// 	{ value: '1', text: "待商务审核" },
+// 	{ value: '-1', text: "商务退回" },
+// 	{ value: '2', text: "待财务审核" },
+// 	{ value: '-2', text: "财务退回" },
+// 	{ value:'3', text: "待审核" },
+// 	{ value: '-3', text: "审核退回" },
+// 	{ value: '9', text: "待推送分配" },
+// 	{ value: '10', text: "待牛力分配" },
+// 	{ value: '11', text: "牛力推送失败" },
+// ])
+const stateList = ref([])
+const companyOptions = ref([])
+
+// 合同数据
+const contracts = ref([])
+
+// 过滤后的合同数据
+const filteredContracts = computed(() => {
+	let result = contracts.value
+	
+	// 根据生产单位筛选
+	if (companyValue.value === 1) {
+		result = result.filter(contract => contract.companyName.includes('浙江'))
+	} else if (companyValue.value === 2) {
+		result = result.filter(contract => contract.companyName.includes('广东'))
+	}
+	
+	// 可以根据支付方式添加更多筛选逻辑
+	
+	return result
+})
+
+// 初始化数据
+onMounted(() => {
+	getDictData()
+	getTableData()
+	getDeptLists()
+})
+
+// 格式化日期
+function formatDate(dateString) {
+	if (!dateString) return '未知日期'
+	return dateString.split(' ')[0]
+}
+//获取字典数据
+const getDictData = () =>{
+	getDicts("order_state").then(res =>{
+		console.log('order_state',res.data)
+		stateList.value = res.data.map(item =>{
+				
+			return{
+				value:item.dictValue,
+				text:item.dictLabel
+			}
+		})
+	})
+	getDicts("dazhong_dingdan_type").then(res =>{
+		console.log('dazhong_dingdan_type',res.data)
+		orderTypeList.value = res.data
+	})
+	
+}
+//获取列表数据
+const getTableData = () =>{
+	
+	    console.log(queryParams.value)
+	     listsalemain(queryParams.value,paging.value).then(res => {
+	        
+	        contracts.value = res.rows
+	        // total.value = res.total;
+	    });
+		
+}
+const getDeptLists = () =>{
+  listproductList().then(res => {
+     companyOptions.value = res.data.map(item => {
+				return {
+					value:item.deptId,
+					text:item.deptName
+				}
+			})
+	  console.log('companyOptions.value', companyOptions.value)
+  });
+ 
+}
+// 筛选合同
+function filterContracts(e) {
+	console.log("筛选条件变化:",e)
+	// 计算属性会自动更新，无需额外操作
+}
+//编号输入框事件
+const handleInput = (e) =>{
+	console.log('handleInput',e.detail.value)
+}
+// 跳转到详情页
+function gotoDetail(contract) {
+	console.log("查看合同详情:", contract)
+	// proxy.$tab.navigateTo('/pages/work/yonghu/detail')
+	// proxy.$tab.navigateTo(`/pages/work/yonghu/detail?saleid=${contract.saleid}`)
+	// proxy.$tab.navigateTo('pages/work/OrderManager/OrderDetail')
+uni.navigateTo({
+	url: "/pages/work/OrderManager/components/OrderDetail"
+});
+}
+const gotoNewAdd = () =>{
+	uni.navigateTo({
+		url: "/pages/work/OrderManager/components/NewAdd"
+	});
+}
+</script>
+
+<style lang="scss" scoped>
+	.custom-input {
+	  border: 1px solid #ccc;
+	  border-radius: 4px;
+	  padding: 5px;
+	  height: 35px;
+	}
+.container {
+	padding: 10px;
+	background-color: #f5f7fa;
+	min-height: 100vh;
+}
+
+.example {
+	padding:  10px;
+	background: #fff;
+	border-radius: 8px;
+	margin-bottom: 15px;
+	box-shadow: 0 2px 6px rgba(0, 0, 0, 0.05);
+}
+
+:deep(.uni-section .uni-section-header) {
+	padding: 0;
+}
+
+:deep(.uni-card) {
+	padding: 0 !important;
+	margin: 10px 0 !important;
+	border-radius: 8px;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.08);
+}
+
+:deep(.uni-card__content) {
+	padding: 12px !important;
+}
+
+.demo-uni-row {
+	padding: 5px 0;
+	font-size: 14px;
+}
+
+.demo-uni-col {
+	padding: 2px 0;
+	
+	&.dark {
+		color: #333;
+		font-weight: 500;
+	}
+	
+	&.light {
+		color: #666;
+	}
+}
+
+.card-even {
+	border-left: 4px solid #2979ff;
+}
+
+.card-odd {
+	border-left: 4px solid #19be6b;
+}
+
+.no-data {
+	text-align: center;
+	padding: 40px 0;
+	color: #999;
+	font-size: 16px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/work/index.vue b/pages/work/index.vue
index 929edbf..2416d1f 100644
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -15,6 +15,12 @@
     <uni-section title="系统管理" type="line"></uni-section>
     <view class="grid-body">
       <uni-grid :column="4" :showBorder="false" @change="changeGrid">
+		  <uni-grid-item @click="gotoOrderManager">
+		    <view class="grid-item-box" >
+		      <uni-icons type="person-filled" size="30"></uni-icons>
+		      <text class="text">订单管理</text>
+		    </view>
+		  </uni-grid-item>
         <uni-grid-item @click="gotoBusiness">
           <view class="grid-item-box" >
             <uni-icons type="person-filled" size="30"></uni-icons>
@@ -124,6 +130,11 @@
   	 	url:'/pages/work/OrderApproval/index'
   	 })
   }
+  const gotoOrderManager = () =>{
+  	 uni.navigateTo({
+  	 	url:'/pages/work/OrderManager/index'
+  	 })
+  }
   
 </script>
 

From 18d6627f411a0129299a15da859ad749bb9bf60f Mon Sep 17 00:00:00 2001
From: Fsd0511 <422865775@qq.com>
Date: Mon, 1 Sep 2025 16:05:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=9F=BA=E6=9C=AC=E5=AE=8C=E7=BB=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/orderManager/index.js                     |  57 +-
 main.js                                       |  32 +-
 package.json                                  |   5 +
 pages.json                                    |  11 +-
 .../work/OrderManager/components/EditData.vue | 882 ++++++++++++++++++
 .../work/OrderManager/components/LookData.vue | 590 ++++++++++++
 pages/work/OrderManager/components/NewAdd.vue |  79 +-
 .../OrderManager/components/OrderDetail.vue   | 449 ---------
 pages/work/OrderManager/index.vue             |  18 +-
 store/modules/orderManager.js                 |  45 +
 10 files changed, 1684 insertions(+), 484 deletions(-)
 create mode 100644 package.json
 create mode 100644 pages/work/OrderManager/components/EditData.vue
 create mode 100644 pages/work/OrderManager/components/LookData.vue
 delete mode 100644 pages/work/OrderManager/components/OrderDetail.vue
 create mode 100644 store/modules/orderManager.js

diff --git a/api/orderManager/index.js b/api/orderManager/index.js
index 93e88ed..201b0ac 100644
--- a/api/orderManager/index.js
+++ b/api/orderManager/index.js
@@ -26,4 +26,59 @@ export function listsaleBusGoodsList(data,query) {
         params: query,
        
     })
-}
\ No newline at end of file
+}
+// 查询剩余额度
+export function getsalemaincheckAmount(queryParams) {
+    return request({
+        url: '/bussiness/salemain/checkAmount?companyId=' + queryParams.companyId + '&saleId=' + queryParams.saleId,
+        method: 'post',
+        // isEncrypt: false
+    })
+}
+// 新增
+export function addsalemain(data) {
+    return request({
+        url: '/bussiness/salemain/add',
+        method: 'post',
+        data: data,
+        // isEncrypt: false
+    })
+}
+
+// 修改
+export function updatesalemain(data) {
+    return request({
+        url: '/bussiness/salemain/edit',
+        method: 'post',
+        data: data,
+        // isEncrypt: false
+    })
+}
+
+// 查询详细
+export function salemainDetail(salemainId) {
+    return request({
+        url: '/bussiness/salemain/info?id=' + salemainId,
+        method: 'get',
+        // isEncrypt: false
+    })
+}
+// 商务经理审批时获取详情，下面的商品列表
+export function businessManagerReviewGoodsList(salemainId) {
+    return request({
+        url: '/bussiness/businessgoods/businessManagerReviewGoodsList?saleId=' + salemainId,
+        method: 'post',
+        // isEncrypt: false
+    })
+}
+
+
+
+// 删除
+export function delsalemain(id) {
+    return request({
+        url: '/bussiness/salemain/remove?ids=' +id,
+        method: 'post',
+        // isEncrypt: false
+    })
+}
diff --git a/main.js b/main.js
index cbe9a47..fc115ae 100644
--- a/main.js
+++ b/main.js
@@ -1,18 +1,34 @@
+// main.js
 import { createSSRApp } from 'vue'
 import App from './App'
-import store from './store' // store
-import { install } from './plugins' // plugins
-import './permission' // permission
+import store from './store'        // Vuex store（如果还在用）
+import { install } from './plugins' // 自定义插件
+import './permission'             // 路由权限
 import { useDict } from '@/utils/dict'
-// 全局注册 dict-tag 组件
-// import DictTag from '@/components/dict-tag/dict-tag.vue';
+import { createPinia } from 'pinia'
+import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
+
 export function createApp() {
   const app = createSSRApp(App)
-  app.use(store)
-  // app.component('dict-tag', DictTag);
+  const pinia = createPinia()
+
+  // ✅ 安全注册持久化插件
+  if (piniaPluginPersistedstate) {
+    pinia.use(piniaPluginPersistedstate)
+  } else {
+    console.warn('pinia-plugin-persistedstate not found, persistence may not work')
+  }
+
+  app.use(pinia)
+  app.use(store) // 如果你还在用 Vuex，否则可删除
+
+  // 挂载全局方法
   app.config.globalProperties.useDict = useDict
+
+  // 安装其他插件
   install(app)
+
   return {
     app
   }
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..e28cdf7
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "pinia-plugin-persistedstate": "^4.5.0"
+  }
+}
diff --git a/pages.json b/pages.json
index 6ac2ba9..5a076cd 100644
--- a/pages.json
+++ b/pages.json
@@ -106,15 +106,22 @@
         "navigationBarTitleText": "订单审批详情"
       }
     },{
-      "path": "pages/work/OrderManager/components/OrderDetail",
+      "path": "pages/work/OrderManager/components/LookData",
       "style": {
-        "navigationBarTitleText": "订单管理详情"
+        "navigationBarTitleText": "订单详情",
+		"props": true  //  开启 props 传参
       }
     },{
       "path": "pages/work/OrderManager/components/NewAdd",
       "style": {
         "navigationBarTitleText": "新增订单"
       }
+    },{
+      "path": "pages/work/OrderManager/components/EditData",
+      "style": {
+        "navigationBarTitleText": "修改订单",
+		"props": true  //  开启 props 传参
+      }
     }],
 	
   "tabBar": {
diff --git a/pages/work/OrderManager/components/EditData.vue b/pages/work/OrderManager/components/EditData.vue
new file mode 100644
index 0000000..c7fb96b
--- /dev/null
+++ b/pages/work/OrderManager/components/EditData.vue
@@ -0,0 +1,882 @@
+<template>
+  <view class="order-detail-container">
+    <!-- 基础信息区域 -->
+
+    <view class="info-section">
+      <uni-row class="info-grid">
+        <uni-col class="flex-row">
+          <view class="label">生产单位: </view>
+          <uni-data-select
+               v-model="form.companyId"
+               :localdata="companyOptions"
+               text-field="deptName"        
+               value-field="deptId"        
+               @change="getEdu"      
+               :clear="true"
+			   disabled="true"
+             />
+        </uni-col>
+      </uni-row>
+      <uni-row class="info-grid">
+        <uni-col :span="12">
+          <view class="label">剩余金额:{{ remainingMoney}}</view>
+        </uni-col>
+        <uni-col :span="12">
+          <view class="label">订单金额:{{ orderAmount }}</view>
+        </uni-col>
+      </uni-row>
+      <uni-row class="info-grid">
+        <uni-col :span="24" style="display: flex;">
+          <view class="label">已选补差:</view>
+		  <view class="">
+		  	<view style="color: red;" v-if="buchaGoodsList.length&&selectedBuCha.length==0">
+		  		 提示:当前有补差数据可选择
+		  	</view>
+		  
+		  <view v-else class="" v-for="(item,index) in selectedBuCha"  :key="index">
+		  	商品：{{item.goodsname}},金额：{{item.piaokou}}
+		  </view>
+		  </view>
+        </uni-col>
+      </uni-row>
+      <button type="primary" @click="toShowBucha" v-show="buChaButState">选择补差</button>
+    </view>
+
+	<!-- 补差列表 -->
+  <view class="" v-if="ShowBucha">
+    <!-- 商品信息区域 -->
+    <view class="goods-section">
+      <view class="section-title">
+		  <view class="">
+		  	补差商品信息
+		  </view>
+	   <view class="select-all">
+	          <checkbox 
+			  :checked="allSelected" 
+			  @click="toggleSelectAll" 
+			 ></checkbox>
+	        </view>
+	  </view>
+      <view v-if="buchaGoodsList.length === 0" class="no-data">
+        暂无商品数据
+      </view>
+
+      <view v-else class="goods-double-column">
+	   <checkbox-group @change="checkboxChange">		
+        <view 
+          v-for="(goods, index) in buchaGoodsList" 
+          :key="goods.piaokouid" 
+          class="goods-item"
+        >
+          <view class="goods-header">
+           
+              <text class="serial-number">{{ index + 1 }}</text>
+              <text class="goods-name">{{ goods.goodsname }}</text>
+			   <checkbox :checked="selectedList.includes(goods.piaokouid)" :value="goods.piaokouid">
+			   </checkbox>
+           
+          </view>
+          
+          <view class="goods-content">
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">申请日期:{{  goods.applydate }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">补差类型:{{  goods.piaokoutype }}</view>
+              </uni-col>
+            </uni-row>
+
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">商品简称:{{ goods.shortname }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">可补差金额:{{ goods.piaokou }}</view>
+              </uni-col>
+            </uni-row>
+			
+          </view>
+        </view>
+		</checkbox-group>
+      </view>
+    </view>
+	<!-- 操作按钮 -->
+	<view class="action-buttons">
+	  <button @click="goAdd" class="btn btn-secondary">添加</button>
+	  <button @click="goCancel" class="btn btn-primary">取消</button>
+	</view>
+	 </view>
+	
+  <view v-else>
+    <!-- 商品信息区域 -->
+    <view class="goods-section">
+      <view class="section-title">
+    	  <view class="">
+    	  	商品信息
+    	  </view>
+
+      </view>
+      <view v-if="goodsList.length === 0" class="no-data">
+        暂无商品数据
+      </view>
+    
+      <view v-else class="goods-double-column">
+        <view 
+          v-for="(goods, index) in goodsList"
+          :key="goods.goodsid"
+          class="goods-item"
+        >
+          <view class="goods-header">
+           
+              <text class="serial-number">{{ index + 1 }}</text>
+              <text class="goods-name">{{ goods.goodsname }}</text>
+    		 
+           
+          </view>
+          
+          <view class="goods-content">
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">件装数:{{  goods.packingnum }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">供应参考价:{{  goods.invoiceprice }}</view>
+              </uni-col>
+            </uni-row>
+    
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">前三月平均数:{{ goods.threeMonths }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">使用票扣:{{ goods.piaokou }}</view>
+              </uni-col>
+            </uni-row>
+    
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">小计:{{ goods.allmoney }}</view>
+              </uni-col>
+             <uni-col :span="12" class="info-pair">
+               <view class="label">税率:{{ goods.taxrate }}</view>
+             </uni-col>
+            </uni-row>
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair flex-row" >
+                <view class="label">采购数量:</view>
+                <input
+                  class="uni-input custom-input"
+                  v-model.number="goods.goodsnum"
+                  placeholder="请输入采购数量"
+                  @confirm="e =>handleInput(e,index)"/>
+              </uni-col>
+            </uni-row>
+    		
+          </view>
+        </view>
+      </view>
+    </view>
+	<!-- 操作按钮 -->
+	<view class="action-buttons">
+	  <button @click="goSave" class="btn btn-secondary">保存</button>
+	  <button @click="goSubmit" class="btn btn-primary">确认提交</button>
+	</view>
+	 </view>
+   
+  </view>
+</template>
+
+<script setup>
+// import { addsalemain } from '../../../../api/orderManager/index.js'
+import { getsalemaincheckAmount ,updatesalemain} from '../../../../api/orderManager/index.js'
+import { onMounted, ref ,computed} from 'vue'
+import { contractData, goodsData } from '../detailData.js'
+import { listsaleBusGoodsList } from '../../../../api/orderManager/index.js'
+import { listproductList } from '../../../../api/orderManager/index.js'
+// import { getInfo } from '../../../../store/modules/user.js'
+import { useUserStore } from '../../../../store/modules/user.js'
+import data1 from './data1.js'
+import { useOrderManagerStore } from '../../../../store/modules/orderManager.js'
+//已选补差
+const selectedBuCha = ref([])
+// 商品列表数据
+const buchaGoodsList =ref([])
+const goodsList = ref([])
+const form = ref({
+	companyId:1,
+})
+const RemainingMoney = ref('0.00') // 剩余金额
+//显示补差按钮
+const buChaButState = ref(true)
+//显示选中所有按钮
+const allSelected = ref(false)
+//储存选中的列表
+const selectedList = ref([])
+//显示补差
+const ShowBucha = ref(false)
+//剩余金额
+const remainingMoney = ref(0)
+//订单金额
+const orderAmount = ref(0.00)
+// 入参
+const queryNum = ref({})
+// 基础信息
+const contract = ref({})
+// 生产单位
+const companyOptions = ref([])
+const monthOptions = ref([
+  { value: 0, text: '本月执行' },
+  { value: 1, text: '下月执行' }
+])
+// // 通用的金额格式化函数
+// const formatMoney = (value) => {
+//   const num = Number(value)
+//   return isNaN(num) 
+//     ? '0.00' 
+//     : num.toLocaleString('en-US', {
+//         minimumFractionDigits: 2,
+//         maximumFractionDigits: 2
+//       })
+// }
+// // 创建计算属性（可选）
+// const formattedRemainingMoney = computed(() => formatMoney(RemainingMoney.value))
+// const formattedContractMoney = computed(() => formatMoney(form.value.contractmoney))
+
+onMounted(() => {
+  // contract.value = contractData.data[0]
+  // console.log(contract.value)
+ 
+  getEditData()
+  getEdu()
+  // getsalemainpiAoKouList()
+  
+  // GetlistsaleBusGoodsList()
+ 
+})
+const getEditData = () =>{
+	const rowdata = useOrderManagerStore().orders[0]
+	    form.value.companyId = rowdata.companyId
+	    form.value.saleid = rowdata.saleid
+		console.log('rowdata',rowdata)
+		
+	    // 查询剩余额度
+	    // const AmountqueryParams = {
+	    //     companyId:rowdata.companyId,
+	    //     saleId: rowdata.saleid,
+	    // }
+	    // // 查询额度
+	    // getsalemaincheckAmount(AmountqueryParams).then(res => {
+	    //     remainingMoney.value = res.data.amounts
+	    // });
+	    // 查询商品,票扣列表
+		GetlistsaleBusGoodsList(rowdata)
+		getsalemainpiAoKouList()
+		 getDeptLists()
+		// 在页面中测试
+		// console.log('当前存储:', uni.getStorageInfoSync())
+}
+// 获取补差，票扣列表数据
+function getsalemainpiAoKouList() {
+    const body = {
+       companyId:form.value.companyId, 
+    }
+   buchaGoodsList.value = data1.data
+    // salemainpiAoKouList(body).then(res => {
+    //     BuChatableData.value = res.data
+    // });
+}
+function GetlistsaleBusGoodsList(rowdata) {
+  // // 查询可销售商品列表
+    const KeSaleGoodsParams ={
+        companyId:form.value.companyId,
+        userid: useUserStore().id,
+		saleId:rowdata.saleid,
+        // userid: 41,
+        deleteflag:0,           //不禁用的，禁用标志 0: 不禁用 1: 禁用 2, 流程中
+        state:1,                //状态0待审核,1已审核
+    }
+	console.log('form',form.value)
+    const KeSaleGoodsQuery = {
+        pageNum: 1,
+        pageSize: 999,
+    }
+    listsaleBusGoodsList(KeSaleGoodsParams,KeSaleGoodsQuery).then(res => {
+        goodsList.value = res.data
+    });
+}
+
+
+const getDeptLists = () =>{
+  listproductList().then(res => {
+     companyOptions.value = res.data.map(item => {
+				return {
+					value:item.deptId,
+					text:item.deptName
+				}
+			})
+	  console.log('companyOptions.value', companyOptions.value)
+  });
+ 
+}
+/**
+ * 判断两个数组是否**严格相等**（顺序、值、类型都一致）
+ */
+
+function arraysEqual(a, b) {
+  return (
+    Array.isArray(a) &&
+    Array.isArray(b) &&
+    a.length === b.length &&
+    a.every((val, idx) => val === b[idx])
+  );
+}
+// 操作方法
+const checkboxChange = (value) =>{
+	// console.log("value",value)
+	let idList = value.detail.value
+	let compareList = []
+	selectedList.value = idList//对比列表
+	selectedBuCha.value = []
+	let temp =true
+	idList.forEach(item =>{
+		
+		buchaGoodsList.value.forEach(item1 =>{
+			
+			if( temp ){
+			compareList.push(item1.piaokouid)
+			}
+			if(item1.piaokouid == item){
+				selectedBuCha.value.push(
+				{ goodsname: item1.goodsname,
+				piaokou: item1.piaokou,
+				goodsid:item1.goodsid}
+				)
+			}
+		})
+		temp =false
+	}
+	)
+	//判断是否全选中
+	console.log("111",arraysEqual(idList,compareList))
+
+	console.log("111",idList,compareList)
+    
+	if(compareList.length!==0&&idList.length!==0&&arraysEqual(idList,compareList)){
+		allSelected.value = true
+	}else{
+		allSelected.value = false
+	}
+	
+}
+/** 更改生产单位时，查询额度 */
+function getEdu() {
+    console.log(form.value.companyId,'form.value.companyId生产单位ID')
+     // 清空已选补差数据
+    const AmountqueryParams = {
+        companyId:form.value.companyId,
+        saleId: 0,
+    }
+    // 查询剩余额度
+    getsalemaincheckAmount(AmountqueryParams).then(res => {
+        remainingMoney.value = res.data.amounts
+    });
+    GetlistsaleBusGoodsList()
+    getsalemainpiAoKouList()
+
+}
+//选择所有列表
+const toggleSelectAll = () =>{
+	if(!allSelected.value){
+		selectedList.value = buchaGoodsList.value.map(item => item.piaokouid)
+		allSelected.value = true
+		selectedBuCha.value = []
+		buchaGoodsList.value.forEach(item1 =>{
+				selectedBuCha.value.push(
+				{ goodsname: item1.goodsname,
+				piaokou: item1.piaokou,
+				goodsid:item1.goodsid}
+				)
+			
+		})
+	}else{
+		selectedBuCha.value = []//清除已补差数据
+		selectedList.value = []//清除已选中
+		allSelected.value = false
+	}
+	console.log("value",selectedList.value)
+	console.log("value",allSelected.value)
+}
+
+//添加
+const goAdd = () =>{
+	console.log('添加！')
+	//算出每个药品的总piaokou
+	console.log('selectedBuCha.value！',selectedBuCha.value)
+	if(selectedBuCha.value.length!==0){
+		const piaoKouSum = selectedBuCha.value.reduce((acc , cur) =>{
+			  acc[cur.goodsid] = (acc[cur.goodsid]||0) + cur.piaokou
+			  return acc
+		},{})
+	   
+		console.log('piaoKouSum！',piaoKouSum)
+		goodsList.value.forEach( item =>{
+			  if(piaoKouSum[item.goodsid] !== undefined){
+				  item.piaokou = piaoKouSum[item.goodsid]
+			  }
+		})
+		
+	}else{
+		uni.showToast({
+		  title: '没有选择数据!',
+		  icon: 'none',
+		  duration: 2000
+		});
+		return
+	}
+	
+	uni.showToast({
+	  title: '添加成功!',
+	  icon: 'success',
+	  duration: 2000
+	});
+	window.scrollTo({ top: 0, behavior: 'smooth' });
+	ShowBucha.value = false
+	buChaButState.value =true
+}
+//取消
+const goCancel = () =>{
+	ShowBucha.value = false
+	buChaButState.value =true
+	window.scrollTo({ top: 0, behavior: 'smooth' });
+	console.log('取消！')
+}
+// 计算小计
+const handleInput = (e, index) => {
+	console.log('index',index)
+  const value = e.detail.value
+  // 将输入值转为数字
+  const num = Number(value)
+  if (isNaN(num)) return // 防止非数字输入
+  // 更新采购数量
+  goodsList.value[index].goodsnum = Number(num)
+  // 重新计算小计 = 采购数量 × 供应参考价
+  goodsList.value[index].allmoney = Math.ceil(num * goodsList.value[index].invoiceprice*100)/100
+  //计算订单金额
+  orderAmount.value = 0
+  goodsList.value.forEach(item =>{
+	  orderAmount.value += Number(item.invoiceprice)*Number(item.goodsnum)
+  } )
+   orderAmount.value = Math.ceil(orderAmount.value * 100) / 100;
+   console.log('orderAmount',orderAmount.value)
+}
+
+const toggleSelection = (index) => {
+  goodsList.value[index].selected = !goodsList.value[index].selected;
+}
+
+const handleByCompany = (value) => {
+  console.log("value", value)
+  // 更新数据
+}
+const validatePiaokou = () => {
+  // 找出所有piaokou大于xiaoji的商品
+  const invalidItems = form.value.saledetailList.filter(
+    item => item.piaokou > item.xiaoji
+  );
+  
+  if (invalidItems.length > 0) {
+    // 构建错误提示信息
+    const errorMessage = `以下商品的票扣金额大于小计金额：\n` +
+      invalidItems.map(item => 
+        `- ${item.goodsname} (票扣: ${item.piaokou}, 小计: ${item.xiaoji})`
+      ).join('\n');
+    
+    uni.showToast({
+      title: errorMessage,
+      icon: 'none',
+      duration: 3000
+    });
+    return false;
+  }
+  
+  return true;
+};
+const goSave = () => {
+ 
+  // 成功提示 (类似 ElMessage.success)
+  const tableData =goodsList.value;
+      const filteredData = tableData.filter(item => 
+          item.goodsnum !== null && 
+          item.goodsnum !== '' && 
+          item.goodsnum !== 0 && 
+          !isNaN(item.goodsnum)
+      );
+      form.value.saledetailList = filteredData
+       form.value.saledetailList = form.value.saledetailList.map(item => ({
+          ...item,
+          price:item.invoiceprice,
+          xiaoji:item.allmoney
+      }));
+      // 添加验证
+    if (!validatePiaokou()) {
+      return; // 验证不通过，停止执行
+    }
+	form.value.state = 0 // 0为保存，可修改编辑，1的时候为提交，
+	updatesalemain(form.value).then(res => {
+	        uni.showToast({
+              title: '保存成功!',
+               icon: 'success',
+              duration: 2000
+                });
+				uni.navigateTo({
+					url:'/pages/work/OrderManager/index'
+				})
+	         })
+      
+	  //提交
+     console.log(" form.value.state", form.value)
+  
+}
+const goSubmit = () => {
+  console.log("审核操作")
+      const tableData =goodsList.value;
+     const filteredData = tableData.filter(item => 
+         item.goodsnum !== null && 
+         item.goodsnum !== '' && 
+         item.goodsnum !== 0 && 
+         !isNaN(item.goodsnum)
+     );
+     form.value.saledetailList = filteredData
+      form.value.saledetailList = form.value.saledetailList.map(item => ({
+         ...item,
+         price:item.invoiceprice,
+         xiaoji:item.allmoney
+     }));
+     // 添加验证
+   if (!validatePiaokou()) {
+     return; // 验证不通过，停止执行
+   }
+ 	form.value.state = 1 // 0为保存，可修改编辑，1的时候为提交，
+ 	updatesalemain(form.value).then(res => {
+ 	        uni.showToast({
+             title: '提交成功!',
+              icon: 'success',
+             duration: 2000
+               });
+ 				uni.navigateTo({
+ 					url:'/pages/work/OrderManager/index'
+ 				})
+ 	         })
+}
+
+const toShowBucha = () => {
+	ShowBucha.value = true
+	buChaButState.value =false
+  console.log("选择补差")
+}
+</script>
+
+<style lang="scss" scoped>
+	// ::v-deep .uni-checkbox-input {
+	//   background-color: #fff !important;
+	//   border-color: #67c23a !important;
+	// }
+	
+	// ::v-deep .uni-checkbox-input-checked {
+	//   background-color: #fff !important;
+	//   color: #67c23a !important; /* 对号颜色 */
+	
+	// }
+	// ::v-deep .uni-checkbox-input svg{
+	// 	  viewBox: 0 0 36 36;
+	// 	  width: 22rpx;
+	// 	  height: 22rpx;
+	//   }
+	.select-all {
+		//靠右显示
+		margin-left: auto;
+		// margin-left: 10rpx;
+		// background-color: #67c23a;
+	}
+.custom-input {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  padding: 5px;
+  height: 25px;
+}
+.order-detail-container {
+  padding: 16px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+.flex-row {
+  display: flex;
+  align-items: center; /* 垂直居中对齐 */
+  gap: 10px; /* 标签和下拉框之间的间距 */
+}
+
+.page-title {
+  text-align: center;
+  margin-bottom: 24px;
+  color: #333;
+  font-size: 18px;
+  font-weight: 600;
+  padding: 12px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+/* 基础信息网格布局 */
+.info-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.info-grid {
+  :deep(.uni-row) {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .info-value {
+    font-size: 15px;
+    color: #333;
+    font-weight: 500;
+    display: flex;
+    justify-content: flex-end;
+  }
+  
+  margin-bottom: 20rpx;
+  margin-top: 20rpx;
+}
+
+.info-item {
+  margin-bottom: 12px;
+}
+
+.label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 4px;
+  font-weight: 500;
+}
+
+.required::after {
+  content: '*';
+  color: #f56c6c;
+  margin-left: 2px;
+}
+
+.amount {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.select-container {
+  width: 100%;
+}
+
+:deep(.uni-data-select__text) {
+  padding: 8px 12px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+:deep(.month-popup) {
+  min-width: 120px;
+}
+
+/* 商品信息区域 */
+.goods-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.section-title {
+  font-size: 16px;
+  color: #333;
+  margin: 0 0 16px 0;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+}
+
+.no-data {
+  text-align: center;
+  color: #999;
+  padding: 40px 0;
+  font-size: 14px;
+}
+
+/* 商品双栏布局 */
+.goods-double-column {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.goods-item {
+  border: 1px solid #eee;
+  border-radius: 12px;
+  overflow: hidden;
+  background: #fafafa;
+}
+
+.goods-header {
+  background: #409eff;
+  color: white;
+  padding: 10px 16px;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.serial-number {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.goods-name {
+  font-size: 15px;
+  font-weight: 600;
+  flex: 1;
+}
+
+/* 商品内容区域 */
+.goods-content {
+  padding: 12px 16px;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.info-pair {
+  flex: 1;
+  padding: 0 8px;
+}
+
+.info-pair .label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 2px;
+}
+
+.info-pair .value {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  text-align: right;
+}
+
+.quantity {
+  color: #409eff;
+  font-weight: 600;
+}
+
+.total {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.empty {
+  visibility: hidden;
+}
+
+/* 操作按钮 */
+.action-buttons {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+  padding: 16px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.btn {
+  padding: 12px 24px;
+  border: none;
+  border-radius: 8px;
+  font-size: 15px;
+  font-weight: 500;
+  cursor: pointer;
+  min-width: 80px;
+  text-align: center;
+  flex: 1;
+}
+
+.btn-primary {
+  background: #409eff;
+  color: white;
+}
+
+.btn-secondary {
+  background: #67c23a;
+  color: white;
+}
+
+.btn-outline {
+  background: #fff;
+  color: #333;
+  border: 1px solid #ddd;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .order-detail-container {
+    padding: 12px;
+  }
+
+  .info-item {
+    margin-bottom: 10px;
+  }
+
+  .info-pair {
+    padding: 0 4px;
+  }
+
+  .action-buttons {
+    flex-direction: column;
+  }
+
+  .btn {
+    width: 100%;
+    margin-bottom: 8px;
+  }
+
+  .btn:last-child {
+    margin-bottom: 0;
+  }
+}
+
+/* 添加多选框样式 */
+.uni-checkbox {
+  display: inline-flex;
+  align-items: center;
+  margin-right: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/work/OrderManager/components/LookData.vue b/pages/work/OrderManager/components/LookData.vue
new file mode 100644
index 0000000..f4ad765
--- /dev/null
+++ b/pages/work/OrderManager/components/LookData.vue
@@ -0,0 +1,590 @@
+<template>
+  <view class="order-detail-container">
+    <!-- 基础信息区域 -->
+
+    <view class="info-section">
+      <uni-row class="info-grid">
+        <uni-col class="flex-row">
+          <view class="label">生产单位: </view>
+          <uni-data-select
+               v-model="form.companyId"
+               :localdata="companyOptions"
+               text-field="deptName"        
+               value-field="deptId"        
+               @change="getEdu"      
+               :clear="true"
+			   disabled="true"
+             />
+        </uni-col>
+      </uni-row>
+      <uni-row class="info-grid">
+        <uni-col :span="12">
+          <view class="label">剩余金额:{{ remainingMoney}}</view>
+        </uni-col>
+        <uni-col :span="12">
+          <view class="label">订单金额:{{ orderAmount }}</view>
+        </uni-col>
+      </uni-row>
+      <uni-row class="info-grid">
+        <!-- <uni-col :span="24" style="display: flex;">
+          <view class="label">已选补差:</view>
+		     <view class="">
+		  	 <view style="color: red;" v-if="buchaGoodsList.length&&selectedBuCha.length==0">
+		  		 提示:当前有补差数据可选择
+		  	</view>
+		 
+		  <view v-else class="" v-for="(item,index) in selectedBuCha"  :key="index">
+		  	商品：{{item.goodsname}},金额：{{item.piaokou}}
+		  </view>
+		  </view> 
+        </uni-col> -->
+      </uni-row>
+     
+    </view>
+
+	
+ 
+	
+  <view>
+    <!-- 商品信息区域 -->
+    <view class="goods-section">
+      <view class="section-title">
+    	  <view class="">
+    	  	商品信息
+    	  </view>
+
+      </view>
+      <view v-if="goodsList.length === 0" class="no-data">
+        暂无商品数据
+      </view>
+    
+      <view v-else class="goods-double-column">
+        <view 
+          v-for="(goods, index) in goodsList"
+          :key="goods.goodsid"
+          class="goods-item"
+        >
+          <view class="goods-header">
+           
+              <text class="serial-number">{{ index + 1 }}</text>
+              <text class="goods-name">{{ goods.goodsname }}</text>
+    		 
+           
+          </view>
+          
+          <view class="goods-content">
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">件装数:{{  goods.packingnum }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">供应参考价:{{  goods.invoiceprice }}</view>
+              </uni-col>
+            </uni-row>
+    
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">前三月平均数:{{ goods.threeMonths }}</view>
+              </uni-col>
+              <uni-col :span="12" class="info-pair">
+                <view class="label">使用票扣:{{ goods.piaokou }}</view>
+              </uni-col>
+            </uni-row>
+    
+           
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair">
+                <view class="label">小计:{{ goods.allmoney }}</view>
+              </uni-col>
+             <uni-col :span="12" class="info-pair">
+               <view class="label">税率:{{ goods.taxrate }}</view>
+             </uni-col>
+            </uni-row>
+            <uni-row class="info-row">
+              <uni-col :span="12" class="info-pair flex-row" >
+                <view class="label">采购数量:</view>
+				 <view class="label">税率:{{ goods.goodsnum }}</view>
+              <!--  <input
+                  class="uni-input custom-input"
+                  v-model="goods.goodsnum"
+                  placeholder="请输入采购数量"
+                  @confirm="e =>handleInput(e,index)"/> -->
+              </uni-col>
+            </uni-row>
+    		
+          </view>
+        </view>
+      </view>
+    </view>
+	<!-- 操作按钮 -->
+	<view class="action-buttons">
+	  <button @click="goCancel" class="btn btn-secondary">取消</button>
+	  <!-- <button @click="goSubmit" class="btn btn-primary">确认提交</button> -->
+	</view>
+	 </view>
+   
+  </view>
+</template>
+
+<script setup>
+import { addsalemain } from '../../../../api/orderManager/index.js'
+
+import { onMounted, ref ,computed} from 'vue'
+import { contractData, goodsData } from '../detailData.js'
+import { listsaleBusGoodsList } from '../../../../api/orderManager/index.js'
+import { listproductList,salemainDetail,businessManagerReviewGoodsList,getsalemaincheckAmount } from '../../../../api/orderManager/index.js'
+// import { getInfo } from '../../../../store/modules/user.js'
+import { useUserStore } from '../../../../store/modules/user.js'
+import { useOrderManagerStore } from '../../../../store/modules/orderManager.js'
+import data1 from './data1.js'
+
+//已选补差
+const selectedBuCha = ref([])
+// 商品列表数据
+const buchaGoodsList =ref([])
+const goodsList = ref([])
+const form = ref({
+	companyId:1,
+})
+const userStore =  useUserStore() 
+const RemainingMoney = ref('0.00') // 剩余金额
+//显示补差按钮
+const buChaButState = ref(true)
+//显示选中所有按钮
+const allSelected = ref(false)
+//储存选中的列表
+const selectedList = ref([])
+//显示补差
+const ShowBucha = ref(false)
+//剩余金额
+const remainingMoney = ref(0)
+//订单金额
+const orderAmount = ref(0.00)
+// 入参
+const queryNum = ref({})
+// 基础信息
+const contract = ref({})
+// 生产单位
+const companyOptions = ref([])
+const monthOptions = ref([
+  { value: 0, text: '本月执行' },
+  { value: 1, text: '下月执行' }
+])
+// // 通用的金额格式化函数
+// const formatMoney = (value) => {
+//   const num = Number(value)
+//   return isNaN(num) 
+//     ? '0.00' 
+//     : num.toLocaleString('en-US', {
+//         minimumFractionDigits: 2,
+//         maximumFractionDigits: 2
+//       })
+// }
+// // 创建计算属性（可选）
+// const formattedRemainingMoney = computed(() => formatMoney(RemainingMoney.value))
+// const formattedContractMoney = computed(() => formatMoney(form.value.contractmoney))
+
+onMounted(() => {
+  // contract.value = contractData.data[0]
+  // console.log(contract.value)
+  getEdu()
+  getDeptLists()
+  // GetlistsaleBusGoodsList()
+  getAllData()
+})
+// 获取补差，票扣列表数据
+
+// console.log('saleid',saleid)
+const getAllData = () =>{
+	const rowdata = useOrderManagerStore().oeders[0]
+	salemainDetail(rowdata.saleid).then(res => {
+	        form.value = res.data
+	    });
+	    businessManagerReviewGoodsList(rowdata.saleid).then(res => {
+	        goodsList.value = res.data
+	    });
+	  
+	    // 查询剩余额度
+	    const AmountqueryParams = {
+	        companyId:rowdata.companyId,
+	        saleId: rowdata.saleid,
+	    }
+	    getsalemaincheckAmount(AmountqueryParams).then(res => {
+	        remainingMoney.value = res.data.amounts
+	    });
+}
+function GetlistsaleBusGoodsList() {
+  // // 查询可销售商品列表
+    const KeSaleGoodsParams = {
+        companyId:form.value.companyId,
+        userid: userStore.id,
+        // userid: 41,
+        deleteflag:0,           //不禁用的，禁用标志 0: 不禁用 1: 禁用 2, 流程中
+        // state:1,                //状态0待审核,1已审核
+    }
+    // const KeSaleGoodsQuery = {
+    //     pageNum: 1,
+    //     pageSize: 999,
+    // }
+    listsaleBusGoodsList(KeSaleGoodsParams).then(res => {
+        goodsList.value = res.data
+		// console.log(' goodsList.value', goodsList.value)
+    });
+	// console.log(' userStore.id', userStore.id)
+	
+}
+
+
+const getDeptLists = () =>{
+  listproductList().then(res => {
+     companyOptions.value = res.data.map(item => {
+				return {
+					value:item.deptId,
+					text:item.deptName
+				}
+			})
+	  console.log('companyOptions.value', companyOptions.value)
+  });
+ 
+}
+
+/** 更改生产单位时，查询额度 */
+function getEdu() {
+    console.log(form.value.companyId,'form.value.companyId生产单位ID')
+     // 清空已选补差数据
+    const AmountqueryParams = {
+        companyId:form.value.companyId,
+        saleId: 0,
+    }
+    // 查询剩余额度
+    getsalemaincheckAmount(AmountqueryParams).then(res => {
+        remainingMoney.value = res.data.amounts
+    });
+    GetlistsaleBusGoodsList()
+    // getsalemainpiAoKouList()
+
+}
+
+
+
+
+
+
+
+
+
+
+//取消
+const goCancel = () => {
+
+ uni.navigateTo({
+ 	url:'/pages/work/OrderManager/index'
+ })
+  
+}
+
+
+
+
+</script>
+
+<style lang="scss" scoped>
+	// ::v-deep .uni-checkbox-input {
+	//   background-color: #fff !important;
+	//   border-color: #67c23a !important;
+	// }
+	
+	// ::v-deep .uni-checkbox-input-checked {
+	//   background-color: #fff !important;
+	//   color: #67c23a !important; /* 对号颜色 */
+	
+	// }
+	// ::v-deep .uni-checkbox-input svg{
+	// 	  viewBox: 0 0 36 36;
+	// 	  width: 22rpx;
+	// 	  height: 22rpx;
+	//   }
+	.select-all {
+		//靠右显示
+		margin-left: auto;
+		// margin-left: 10rpx;
+		// background-color: #67c23a;
+	}
+.custom-input {
+  border: 1px solid #ccc;
+  border-radius: 4px;
+  padding: 5px;
+  height: 25px;
+}
+.order-detail-container {
+  padding: 16px;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+}
+.flex-row {
+  display: flex;
+  align-items: center; /* 垂直居中对齐 */
+  gap: 10px; /* 标签和下拉框之间的间距 */
+}
+
+.page-title {
+  text-align: center;
+  margin-bottom: 24px;
+  color: #333;
+  font-size: 18px;
+  font-weight: 600;
+  padding: 12px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+/* 基础信息网格布局 */
+.info-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.info-grid {
+  :deep(.uni-row) {
+    display: flex;
+    flex-wrap: wrap;
+  }
+  .info-value {
+    font-size: 15px;
+    color: #333;
+    font-weight: 500;
+    display: flex;
+    justify-content: flex-end;
+  }
+  
+  margin-bottom: 20rpx;
+  margin-top: 20rpx;
+}
+
+.info-item {
+  margin-bottom: 12px;
+}
+
+.label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 4px;
+  font-weight: 500;
+}
+
+.required::after {
+  content: '*';
+  color: #f56c6c;
+  margin-left: 2px;
+}
+
+.amount {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.select-container {
+  width: 100%;
+}
+
+:deep(.uni-data-select__text) {
+  padding: 8px 12px;
+  border: 1px solid #ddd;
+  border-radius: 8px;
+  background-color: #fff;
+}
+
+:deep(.month-popup) {
+  min-width: 120px;
+}
+
+/* 商品信息区域 */
+.goods-section {
+  background: #fff;
+  border-radius: 12px;
+  padding: 16px;
+  margin-bottom: 20px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.section-title {
+  font-size: 16px;
+  color: #333;
+  margin: 0 0 16px 0;
+  padding-bottom: 8px;
+  border-bottom: 1px solid #eee;
+  font-weight: 600;
+  display: flex;
+  align-items: center;
+}
+
+.no-data {
+  text-align: center;
+  color: #999;
+  padding: 40px 0;
+  font-size: 14px;
+}
+
+/* 商品双栏布局 */
+.goods-double-column {
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+}
+
+.goods-item {
+  border: 1px solid #eee;
+  border-radius: 12px;
+  overflow: hidden;
+  background: #fafafa;
+}
+
+.goods-header {
+  background: #409eff;
+  color: white;
+  padding: 10px 16px;
+  display: flex;
+  align-items: center;
+  gap: 12px;
+}
+
+.serial-number {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 20px;
+  height: 20px;
+  background: rgba(255, 255, 255, 0.2);
+  border-radius: 50%;
+  font-size: 12px;
+  font-weight: 600;
+}
+
+.goods-name {
+  font-size: 15px;
+  font-weight: 600;
+  flex: 1;
+}
+
+/* 商品内容区域 */
+.goods-content {
+  padding: 12px 16px;
+}
+
+.info-row {
+  display: flex;
+  margin-bottom: 8px;
+}
+
+.info-pair {
+  flex: 1;
+  padding: 0 8px;
+}
+
+.info-pair .label {
+  font-size: 14px;
+  color: #666;
+  margin-bottom: 2px;
+}
+
+.info-pair .value {
+  font-size: 14px;
+  color: #333;
+  font-weight: 500;
+  text-align: right;
+}
+
+.quantity {
+  color: #409eff;
+  font-weight: 600;
+}
+
+.total {
+  color: #f56c6c;
+  font-weight: 600;
+}
+
+.empty {
+  visibility: hidden;
+}
+
+/* 操作按钮 */
+.action-buttons {
+  display: flex;
+  justify-content: center;
+  gap: 12px;
+  padding: 16px 0;
+  background: #fff;
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
+}
+
+.btn {
+  padding: 12px 24px;
+  border: none;
+  border-radius: 8px;
+  font-size: 15px;
+  font-weight: 500;
+  cursor: pointer;
+  min-width: 80px;
+  text-align: center;
+  flex: 1;
+}
+
+.btn-primary {
+  background: #409eff;
+  color: white;
+}
+
+.btn-secondary {
+  background: #67c23a;
+  color: white;
+}
+
+.btn-outline {
+  background: #fff;
+  color: #333;
+  border: 1px solid #ddd;
+}
+
+/* 响应式设计 */
+@media (max-width: 768px) {
+  .order-detail-container {
+    padding: 12px;
+  }
+
+  .info-item {
+    margin-bottom: 10px;
+  }
+
+  .info-pair {
+    padding: 0 4px;
+  }
+
+  .action-buttons {
+    flex-direction: column;
+  }
+
+  .btn {
+    width: 100%;
+    margin-bottom: 8px;
+  }
+
+  .btn:last-child {
+    margin-bottom: 0;
+  }
+}
+
+/* 添加多选框样式 */
+.uni-checkbox {
+  display: inline-flex;
+  align-items: center;
+  margin-right: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/pages/work/OrderManager/components/NewAdd.vue b/pages/work/OrderManager/components/NewAdd.vue
index de00ac7..ae40f35 100644
--- a/pages/work/OrderManager/components/NewAdd.vue
+++ b/pages/work/OrderManager/components/NewAdd.vue
@@ -192,7 +192,8 @@
 </template>
 
 <script setup>
-	
+import { addsalemain } from '../../../../api/orderManager/index.js'
+import { getsalemaincheckAmount } from '../../../../api/orderManager/index.js'
 import { onMounted, ref ,computed} from 'vue'
 import { contractData, goodsData } from '../detailData.js'
 import { listsaleBusGoodsList } from '../../../../api/orderManager/index.js'
@@ -206,7 +207,7 @@ const selectedBuCha = ref([])
 const buchaGoodsList =ref([])
 const goodsList = ref([])
 const form = ref({
-	companyId:'1',
+	companyId:1,
 })
 const RemainingMoney = ref('0.00') // 剩余金额
 //显示补差按钮
@@ -248,10 +249,21 @@ const monthOptions = ref([
 onMounted(() => {
   // contract.value = contractData.data[0]
   // console.log(contract.value)
-  buchaGoodsList.value = data1.data
+  getEdu()
+  getsalemainpiAoKouList()
   getDeptLists()
   GetlistsaleBusGoodsList()
 })
+// 获取补差，票扣列表数据
+function getsalemainpiAoKouList() {
+    const body = {
+       companyId:form.value.companyId, 
+    }
+   buchaGoodsList.value = data1.data
+    // salemainpiAoKouList(body).then(res => {
+    //     BuChatableData.value = res.data
+    // });
+}
 function GetlistsaleBusGoodsList() {
   // // 查询可销售商品列表
     const KeSaleGoodsParams ={
@@ -336,14 +348,14 @@ const checkboxChange = (value) =>{
 /** 更改生产单位时，查询额度 */
 function getEdu() {
     console.log(form.value.companyId,'form.value.companyId生产单位ID')
-    BuChaDataShow.value = [] // 清空已选补差数据
+     // 清空已选补差数据
     const AmountqueryParams = {
         companyId:form.value.companyId,
         saleId: 0,
     }
     // 查询剩余额度
     getsalemaincheckAmount(AmountqueryParams).then(res => {
-        RemainingMoney.value = res.data.amounts
+        remainingMoney.value = res.data.amounts
     });
     GetlistsaleBusGoodsList()
     getsalemainpiAoKouList()
@@ -425,7 +437,7 @@ const handleInput = (e, index) => {
   // 更新采购数量
   goodsList.value[index].goodsnum = num
   // 重新计算小计 = 采购数量 × 供应参考价
-  goodsList.value[index].allmoney = num * goodsList.value[index].invoiceprice
+  goodsList.value[index].allmoney = Math.ceil(num * goodsList.value[index].invoiceprice*100)/100
   //计算订单金额
   orderAmount.value = 0
   goodsList.value.forEach(item =>{
@@ -486,25 +498,52 @@ const goSave = () => {
     if (!validatePiaokou()) {
       return; // 验证不通过，停止执行
     }
-	
-      form.value.state = 0 // 0为保存，可修改编辑，1的时候为提交，
+	form.value.state = 0 // 0为保存，可修改编辑，1的时候为提交，
+	addsalemain(form.value).then(res => {
+	        uni.showToast({
+              title: '保存成功!',
+               icon: 'success',
+              duration: 2000
+                });
+				uni.navigateTo({
+					url:'/pages/work/OrderManager/index'
+				})
+	         })
+      
 	  //提交
      console.log(" form.value.state", form.value)
-  uni.showToast({
-    title: '保存成功!',
-    icon: 'success',
-    duration: 2000
-  });
+  
 }
 const goSubmit = () => {
   console.log("审核操作")
- 
- 
-  uni.showToast({
-    title: '审核成功！',
-    icon: 'success',
-    duration: 2000
-  });
+      const tableData =goodsList.value;
+     const filteredData = tableData.filter(item => 
+         item.goodsnum !== null && 
+         item.goodsnum !== '' && 
+         item.goodsnum !== 0 && 
+         !isNaN(item.goodsnum)
+     );
+     form.value.saledetailList = filteredData
+      form.value.saledetailList = form.value.saledetailList.map(item => ({
+         ...item,
+         price:item.invoiceprice,
+         xiaoji:item.allmoney
+     }));
+     // 添加验证
+   if (!validatePiaokou()) {
+     return; // 验证不通过，停止执行
+   }
+ 	form.value.state = 1 // 0为保存，可修改编辑，1的时候为提交，
+ 	addsalemain(form.value).then(res => {
+ 	        uni.showToast({
+             title: '提交成功!',
+              icon: 'success',
+             duration: 2000
+               });
+ 				uni.navigateTo({
+ 					url:'/pages/work/OrderManager/index'
+ 				})
+ 	         })
 }
 
 const toShowBucha = () => {
diff --git a/pages/work/OrderManager/components/OrderDetail.vue b/pages/work/OrderManager/components/OrderDetail.vue
deleted file mode 100644
index f4b46b7..0000000
--- a/pages/work/OrderManager/components/OrderDetail.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<template>
- <view class="order-detail-container">
-    <!-- <view class="page-title">查看详细信息</view> -->
-
-    <!-- 基础信息区域 -->
-    <view class="info-section">
-      <uni-row class="info-grid">
-		  <uni-col >
-          <view class="label">商业公司: {{contract.user_name}} </view>
-		</uni-col>
-		
-		</uni-row>
-		<uni-row class="info-grid">
-			<uni-col :span="12">
-			  <view class="label">制单日期:{{ contract.adddate}}</view>
-			</uni-col>
-			<uni-col :span="12">
-			  <view class="label">合同编号:{{ contract.contractcode }}</view>
-			</uni-col>
-          </uni-row>
-		  <uni-row class="info-grid">
-		  	<uni-col :span="12">
-		  	  <view class="label">订单金额:{{ contract.contractmoney }}</view>
-		  	</uni-col>
-		  	<uni-col :span="12">
-		  	  <view class="label">补差金额:{{ contract.user_name }}</view>
-		  	</uni-col>
-		    </uni-row>
-
-			  <uni-row class="info-grid">
-			  	<uni-col :span="12">
-			  	  <view class="label">支付方式:{{ contract.ispaynow }}</view>
-			  	</uni-col>
-			  	<uni-col :span="12">
-			  	  <view class="label">联系方式:{{ contract.ispaynow }}</view>
-			  	</uni-col>
-			    </uni-row>	
-				  <uni-row class="info-grid">
-				  	<uni-col :span="12">
-					  <view class="label">发货仓库:{{ contract.place }}</view>
-					</uni-col>
-				  	
-				    </uni-row>
-		
-	     
-      
-    </view>
-
-    <!-- 商品信息区域 -->
-    <view class="goods-section">
-      <view class="section-title">商品信息</view>
-      
-      <view v-if="goodsList.length === 0" class="no-data">
-        暂无商品数据
-      </view>
-
-      <view v-else class="goods-double-column">
-        <view 
-          v-for="(goods, index) in goodsList" 
-          :key="index" 
-          class="goods-item"
-        >
-          <view class="goods-header">
-            <text class="serial-number">{{ index + 1 }}</text>
-            <text class="goods-name">{{ goods.goodsname }}</text>
-          </view>
-          
-          <view class="goods-content">
-           
-            <uni-row class="info-row">
-              <uni-col :span="12" class="info-pair">
-                <view class="label">件装数:{{  goods.packingnum }}</view>
-                <!-- <view class="value">{{ goods.packCount }}</view> -->
-              </uni-col>
-              <uni-col :span="12" class="info-pair">
-                <view class="label">单价:{{  goods.invoiceprice }}</view>
-                <!-- <view class="value">{{ goods.referencePrice }}</view> -->
-              </uni-col>
-            </uni-row>
-
-           
-            <uni-row class="info-row">
-              <uni-col :span="12" class="info-pair">
-                <view class="label">前三月平均数:{{ goods.mon3 }}</view>
-                <!-- <view class="value">{{ goods.average }}</view> -->
-              </uni-col>
-              <uni-col :span="12" class="info-pair">
-                <view class="label">采购数量:{{ goods.goodsnum }}</view>
-                <!-- <view class="value quantity">{{ goods.quantity }}</view> -->
-              </uni-col>
-            </uni-row>
-
-           
-            <uni-row class="info-row">
-              <uni-col :span="12" class="info-pair">
-                <view class="label">可分配数:{{ goods.allmoney }}</view>
-                <!-- <view class="value total">{{ goods.subtotal }}</view> -->
-              </uni-col>
-              <uni-col :span="12" class="info-pair">
-                <view class="label">要求补差:{{ goods.piaokou }}</view>
-                <!-- <view class="value">{{ goods.ticketDeduction }}</view> -->
-              </uni-col>
-            </uni-row>
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- 操作按钮 -->
-    <view class="action-buttons">
-      <button @click="goBack" class="btn btn-secondary">审核回退</button>
-      <button @click="review" class="btn btn-primary">审核通过</button>
-	   <button @click="review" class="btn btn-primary">强制推送OA</button>
-    </view>
-  </view>
-</template>
-
-<script setup>
-import { onMounted, ref } from 'vue'
-import { contractData,goodsData } from '../detailData.js'
-
-// 基础信息
-const contract = ref({})
-
-const monthOptions = ref([
-  { value: 0, text: '本月执行' },
-  { value: 1, text: '下月执行' }
-])
-onMounted(()=>{
-	contract.value = contractData.data[0]
-	console.log(contract.value)
-	goodsList.value = goodsData.data
-	
-	
-})
-// 商品列表数据
-const goodsList = ref([
-  {
-    name: '商品A',
-    packCount: '12',
-    referencePrice: '88.00',
-    average: '150',
-    quantity: '1000',
-    subtotal: '88,000.00',
-    ticketDeduction: '是',
-    taxRate: '13%'
-  },
-  {
-    name: '商品B',
-    packCount: '24',
-    referencePrice: '18.00',
-    average: '800',
-    quantity: '1200',
-    subtotal: '21,600.00',
-    ticketDeduction: '否',
-    taxRate: '13%'
-  }
-])
-
-// 操作方法
-const goBack = () => {
-  console.log("回退操作")
-  // 成功提示 (类似 ElMessage.success)
-  uni.showToast({
-    title: '回退成功!',
-    icon: 'success',
-    duration: 2000
-  });
-}
-
-const review = () => {
-  console.log("审核操作")
-  // 成功提示 (类似 ElMessage.success)
-  uni.showToast({
-    title: '审核成功！',
-    icon: 'success',
-    duration: 2000
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-.order-detail-container {
-  padding: 16px;
-  background-color: #f5f5f5;
-  min-height: 100vh;
-}
-
-.page-title {
-  text-align: center;
-  margin-bottom: 24px;
-  color: #333;
-  font-size: 18px;
-  font-weight: 600;
-  padding: 12px 0;
-  background: #fff;
-  border-radius: 12px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-}
-
-/* 基础信息网格布局 */
-.info-section {
-  background: #fff;
-  border-radius: 12px;
-  padding: 16px;
-  margin-bottom: 20px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-}
-
-.info-grid {
-  :deep(.uni-row) {
-    display: flex;
-    flex-wrap: wrap;
-	
-  }
-  .info-value {
-    font-size: 15px;
-    color: #333;
-    font-weight: 500;
-     display: flex;
-     justify-content: flex-end;
-    
-  }
-  
-  margin-bottom: 20rpx;
-  margin-top: 20rpx;
-}
-
-.info-item {
-  margin-bottom: 12px;
-}
-
-.label {
-  font-size: 14px;
-  color: #666;
-  margin-bottom: 4px;
-  font-weight: 500;
-}
-
-.required::after {
-  content: '*';
-  color: #f56c6c;
-  margin-left: 2px;
-}
-
-// .info-value {
-//   font-size: 15px;
-//   color: #333;
-//   font-weight: 500;
-//   display: flex;
-//   justify-content: flex-end;
-  
-// }
-
-.amount {
-  color: #f56c6c;
-  font-weight: 600;
-}
-
-.select-container {
-  width: 100%;
-}
-
-:deep(.uni-data-select__text) {
-  padding: 8px 12px;
-  border: 1px solid #ddd;
-  border-radius: 8px;
-  background-color: #fff;
-}
-
-:deep(.month-popup) {
-  min-width: 120px;
-}
-
-/* 商品信息区域 */
-.goods-section {
-  background: #fff;
-  border-radius: 12px;
-  padding: 16px;
-  margin-bottom: 20px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-}
-
-.section-title {
-  font-size: 16px;
-  color: #333;
-  margin: 0 0 16px 0;
-  padding-bottom: 8px;
-  border-bottom: 1px solid #eee;
-  font-weight: 600;
-}
-
-.no-data {
-  text-align: center;
-  color: #999;
-  padding: 40px 0;
-  font-size: 14px;
-}
-
-/* 商品双栏布局 */
-.goods-double-column {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-
-.goods-item {
-  border: 1px solid #eee;
-  border-radius: 12px;
-  overflow: hidden;
-  background: #fafafa;
-}
-
-.goods-header {
-  background: #409eff;
-  color: white;
-  padding: 10px 16px;
-  display: flex;
-  align-items: center;
-  gap: 12px;
-}
-
-.serial-number {
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  width: 20px;
-  height: 20px;
-  background: rgba(255,255,255,0.2);
-  border-radius: 50%;
-  font-size: 12px;
-  font-weight: 600;
-}
-
-.goods-name {
-  font-size: 15px;
-  font-weight: 600;
-  flex: 1;
-}
-
-/* 商品内容区域 */
-.goods-content {
-  padding: 12px 16px;
-}
-
-.info-row {
-  display: flex;
-  margin-bottom: 8px;
-}
-
-.info-pair {
-  flex: 1;
-  padding: 0 8px;
-}
-
-.info-pair .label {
-  font-size: 14px;
-  color: #666;
-  margin-bottom: 2px;
-}
-
-.info-pair .value {
-  font-size: 14px;
-  color: #333;
-  font-weight: 500;
-  text-align: right;
-}
-
-.quantity {
-  color: #409eff;
-  font-weight: 600;
-}
-
-.total {
-  color: #f56c6c;
-  font-weight: 600;
-}
-
-.empty {
-  visibility: hidden;
-}
-
-/* 操作按钮 */
-.action-buttons {
-  display: flex;
-  justify-content: center;
-  gap: 12px;
-  padding: 16px 0;
-  background: #fff;
-  border-radius: 12px;
-  box-shadow: 0 2px 8px rgba(0,0,0,0.1);
-}
-
-.btn {
-  padding: 12px 24px;
-  border: none;
-  border-radius: 8px;
-  font-size: 15px;
-  font-weight: 500;
-  cursor: pointer;
-  min-width: 80px;
-  text-align: center;
-  flex: 1;
-}
-
-.btn-primary {
-  background: #409eff;
-  color: white;
-}
-
-.btn-secondary {
-  background: #67c23a;
-  color: white;
-}
-
-.btn-outline {
-  background: #fff;
-  color: #333;
-  border: 1px solid #ddd;
-}
-
-/* 响应式设计 */
-@media (max-width: 768px) {
-  .order-detail-container {
-    padding: 12px;
-  }
-
-  .info-item {
-    margin-bottom: 10px;
-  }
-
-  .info-pair {
-    padding: 0 4px;
-  }
-
-  .action-buttons {
-    flex-direction: column;
-  }
-
-  .btn {
-    width: 100%;
-    margin-bottom: 8px;
-  }
-
-  .btn:last-child {
-    margin-bottom: 0;
-  }
-}
-</style>
\ No newline at end of file
diff --git a/pages/work/OrderManager/index.vue b/pages/work/OrderManager/index.vue
index 1f12be7..2abf1c3 100644
--- a/pages/work/OrderManager/index.vue
+++ b/pages/work/OrderManager/index.vue
@@ -87,7 +87,7 @@ import { ref, reactive, onMounted, computed,getCurrentInstance } from "vue"
 import { contractData } from "../OrderManager/data.js" // 根据实际路径调整
 import { getDicts } from "../../../api/system/dict/data.js"
 // import DictTag from '@/components/dict-tag/dict-tag.vue';
-
+import { useOrderManagerStore } from "../../../store/modules/orderManager.js"
 // import { log } from "console"
 const { proxy } = getCurrentInstance()
 // 表单数据
@@ -214,9 +214,19 @@ function gotoDetail(contract) {
 	// proxy.$tab.navigateTo('/pages/work/yonghu/detail')
 	// proxy.$tab.navigateTo(`/pages/work/yonghu/detail?saleid=${contract.saleid}`)
 	// proxy.$tab.navigateTo('pages/work/OrderManager/OrderDetail')
-uni.navigateTo({
-	url: "/pages/work/OrderManager/components/OrderDetail"
-});
+	//存储要传的值到pinia
+	useOrderManagerStore().addOrder(contract)
+	console.log('数据',useOrderManagerStore().orders)
+	if(contract.state == '0'){
+		uni.navigateTo({
+			url: "/pages/work/OrderManager/components/EditData?"
+		});
+	}else{
+		uni.navigateTo({
+			url: "/pages/work/OrderManager/components/LookData"
+		});
+	}
+
 }
 const gotoNewAdd = () =>{
 	uni.navigateTo({
diff --git a/store/modules/orderManager.js b/store/modules/orderManager.js
new file mode 100644
index 0000000..83f754f
--- /dev/null
+++ b/store/modules/orderManager.js
@@ -0,0 +1,45 @@
+// store/orderManager.js
+import { defineStore } from 'pinia';
+import { ref } from 'vue';
+
+export const useOrderManagerStore = defineStore('orderManager', () => {
+  const orders = ref([]);
+
+  const addOrder = (order) => {
+    orders.value = [order]
+  };
+
+  const removeOrder = (orderId) => {
+    orders.value = orders.value.filter(order => order.id !== orderId);
+  };
+
+  const clearOrders = () => {
+    orders.value = [];
+  };
+
+  return {
+    orders,
+    addOrder,
+    removeOrder,
+    clearOrders
+  };
+}, {
+  persist: {
+    storage: {
+      // 读取：从 uni.storage 获取
+      getItem(key) {
+        const value = uni.getStorageSync(key);
+        // 如果有值，解析 JSON；否则返回 null（Pinia 会处理默认值）
+        return value ? JSON.parse(value) : null;
+      },
+      // 写入：保存到 uni.storage
+      setItem(key, value) {
+        uni.setStorageSync(key, JSON.stringify(value));
+      },
+      // 可选：删除（一般不需要手动调用）
+      removeItem(key) {
+        uni.removeStorageSync(key);
+      }
+    }
+  }
+});
\ No newline at end of file

From 58da6a52b9b5baa9a2c6179775a634eecca96b80 Mon Sep 17 00:00:00 2001
From: Fsd0511 <422865775@qq.com>
Date: Mon, 1 Sep 2025 22:43:08 +0800
Subject: [PATCH 3/3] =?UTF-8?q?pinia=E6=8C=81=E4=B9=85=E5=8C=96=E5=AD=98?=
 =?UTF-8?q?=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                       | 12 +++++++-----
 store/modules/orderManager.js | 37 ++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/main.js b/main.js
index fc115ae..d36a208 100644
--- a/main.js
+++ b/main.js
@@ -5,13 +5,14 @@ import store from './store'        // Vuex store（如果还在用）
 import { install } from './plugins' // 自定义插件
 import './permission'             // 路由权限
 import { useDict } from '@/utils/dict'
-import { createPinia } from 'pinia'
+// import { createPinia } from 'pinia'
+import * as Pinia from 'pinia';
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate'
 
 export function createApp() {
   const app = createSSRApp(App)
-  const pinia = createPinia()
-
+  // const pinia = createPinia()
+const pinia = Pinia.createPinia()
   // ✅ 安全注册持久化插件
   if (piniaPluginPersistedstate) {
     pinia.use(piniaPluginPersistedstate)
@@ -20,7 +21,7 @@ export function createApp() {
   }
 
   app.use(pinia)
-  app.use(store) // 如果你还在用 Vuex，否则可删除
+  // app.use(store) // 如果你还在用 Vuex，否则可删除
 
   // 挂载全局方法
   app.config.globalProperties.useDict = useDict
@@ -29,6 +30,7 @@ export function createApp() {
   install(app)
 
   return {
-    app
+    app,
+	Pinia
   }
 }
\ No newline at end of file
diff --git a/store/modules/orderManager.js b/store/modules/orderManager.js
index 83f754f..6ff7170 100644
--- a/store/modules/orderManager.js
+++ b/store/modules/orderManager.js
@@ -24,22 +24,23 @@ export const useOrderManagerStore = defineStore('orderManager', () => {
     clearOrders
   };
 }, {
-  persist: {
-    storage: {
-      // 读取：从 uni.storage 获取
-      getItem(key) {
-        const value = uni.getStorageSync(key);
-        // 如果有值，解析 JSON；否则返回 null（Pinia 会处理默认值）
-        return value ? JSON.parse(value) : null;
-      },
-      // 写入：保存到 uni.storage
-      setItem(key, value) {
-        uni.setStorageSync(key, JSON.stringify(value));
-      },
-      // 可选：删除（一般不需要手动调用）
-      removeItem(key) {
-        uni.removeStorageSync(key);
-      }
-    }
-  }
+  // persist: {
+  //   storage: {
+  //     // 读取：从 uni.storage 获取
+  //     getItem(key) {
+  //       const value = uni.getStorageSync(key);
+  //       // 如果有值，解析 JSON；否则返回 null（Pinia 会处理默认值）
+  //       return value ? JSON.parse(value) : null;
+  //     },
+  //     // 写入：保存到 uni.storage
+  //     setItem(key, value) {
+  //       uni.setStorageSync(key, JSON.stringify(value));
+  //     },
+  //     // 可选：删除（一般不需要手动调用）
+  //     removeItem(key) {
+  //       uni.removeStorageSync(key);
+  //     }
+  //   }
+  // }
+  persist: true
 });
\ No newline at end of file