diff --git a/.env b/.env
index 032f2b5..9da8be1 100644
--- a/.env
+++ b/.env
@@ -9,10 +9,10 @@ VUE_APP_TBAS_KEY=admin.tabs
 VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
 
 # api服务的baseUrls
-VUE_APP_API_IDS=https://ids.justfit.com
-VUE_APP_API_BASE_URL_API=https://agentapi.justfit.com
+VUE_APP_API_IDS=http://localhost:44339/
+VUE_APP_API_BASE_URL_API=http://localhost:44354/
 VUE_APP_API_COMMON_BASE_URL=https://api.allpcb.com
 VUE_APP_API_OSS_BASE_URL=https://member.justfit.com
 VUE_APP_API_ALLPCB_BASE_URL=https://www.allpcb.com
 
-VUE_APP_YFZX_CSZ=115ecffc-261a-464d-c9c4-3a0343848dd6
\ No newline at end of file
+VUE_APP_YFZX_CSZ=115ecffc-261a-464d-c9c4-3a0343848dd6
diff --git a/.env.test b/.env.test
index cb1d101..3ba63f6 100644
--- a/.env.test
+++ b/.env.test
@@ -1,8 +1,10 @@
 NODE_ENV=production
 
 # api服务的baseUrls
-VUE_APP_API_IDS=/ids
-VUE_APP_API_BASE_URL_API=/
+#VUE_APP_API_IDS=/ids
+#VUE_APP_API_BASE_URL_API=/
+VUE_APP_API_IDS=http://localhost:44339/ids
+VUE_APP_API_BASE_URL_API=http://localhost:44354/
 
 
 VUE_APP_YFZX_CSZ=de89fee0-d722-9d95-9520-3a00f6ff7b35
diff --git a/src/layouts/tabs/TabsView.vue b/src/layouts/tabs/TabsView.vue
index 95b9923..db06e63 100644
--- a/src/layouts/tabs/TabsView.vue
+++ b/src/layouts/tabs/TabsView.vue
@@ -402,9 +402,12 @@ table.tablesd{border:1px solid #eee; border-right:none; border-bottom:none; widt
 .boxCraftDto li{float: left; list-style: none; border:1px solid #eee; padding: 10px; border-radius:.5em; margin:0 20px 10px 0}
 .listTable{border:1px solid #eee; border-right:none; border-bottom:none; display: flex; flex-wrap: wrap; padding:0; margin:0 0 1.5em}
 .listTable>li{border:1px solid #eee; border-left:none; border-top:none; width:25%; list-style: none; margin:0; display:flex}
+.listTable>li.edit .t{color:#f30; font-weight: bold}
 .listTable>li span.t,.listTable>li p.n{padding:.5em}
 .listTable>li span.t{width:15em; background-color: #f9f9f9; text-align:right}
 .listTable>li p.n{width:100%; margin-bottom:0; word-break: break-all;}
+.bnCenter{text-align: center; padding:.5em 0;}
+.bnCenter>*{display: inline-block; margin:0 .5em;}
 @media screen and (max-width:1300px) {
   .listTable>li{width:33.333%}
 }
diff --git a/src/pages/Common/altLog.vue b/src/pages/Common/altLog.vue
new file mode 100644
index 0000000..a494371
--- /dev/null
+++ b/src/pages/Common/altLog.vue
@@ -0,0 +1,64 @@
+<template>
+  <a-modal title="订单日志" width="1000px" :visible="showLog" :confirm-loading="confirmSubmit" @cancel="showLog=false" :footer="null">
+    <a-table class="tablesa" :columns="tableColumns" :data-source="tableData" :rowKey="lists => lists.id" :pagination="pagination" :loading="tableLoad" @change="getLogList">
+      <span slot="creationTime" slot-scope="text">{{formatDateTime(text)}}</span>
+      <span slot="creatorId" slot-scope="text" :title="text" style="max-width:68px; display:block; overflow: hidden; white-space:nowrap;">{{text}}</span>
+    </a-table>
+  </a-modal>
+</template>
+
+<script>
+import {getLogs} from "@/services/order/Order";
+import {formatDate} from "@/services/Common";
+export default {
+  name: "bnOrderLogList",
+  props:['orderId','type'],
+  data(){
+    return{
+      tableLoad: false,showLog:false,confirmSubmit:false,
+      tableColumns:[
+        {title: '操作时间',dataIndex: 'creationTime',key: 'creationTime',width:'150px',scopedSlots: { customRender: 'creationTime' }},
+        {title: '操作人ID',dataIndex: 'creatorId',key: 'creatorId',width:'100px',scopedSlots: { customRender: 'creatorId' }},
+        {title: '操作类型',dataIndex: 'logTypeValue',key: 'logTypeValue',width:'120px'},
+        {title: '修改内容',dataIndex: 'content',key: 'content'},
+        // {title: '内容前后',dataIndex: 'afterData',key: 'afterData',scopedSlots: { customRender: 'afterData' },},
+      ],
+      tableData:[],
+      pagination: {
+        pageSize: 10,
+        current: 1,
+        total:0,
+        // showQuickJumper: true,
+        // showTotal: (total) => `总计 ${total} 条`,
+      },
+    }
+  },
+  methods:{
+    //展示日志
+    fnShowLog(){
+      this.showLog=true;
+      this.getLogList();
+    },
+    async getLogList(page){
+      this.tableLoad = true;
+      if(typeof(page)=='object') this.pagination.current = page.current;
+      let count = (this.pagination.current)*this.pagination.pageSize;
+      let params={
+        page:count,
+        pageSize:this.pagination.pageSize,
+      }
+      let res = await getLogs(params,this.orderId);
+      this.tableData = res.items;
+      // this.pagination.total = res.totalCount;
+      this.tableLoad = false;
+    },
+    formatDateTime(time){
+      return formatDate(time);
+    },
+  }
+}
+</script>
+
+<style scoped>
+
+</style>
diff --git a/src/pages/order/detail.vue b/src/pages/order/detail.vue
index 902dc55..af32ed0 100644
--- a/src/pages/order/detail.vue
+++ b/src/pages/order/detail.vue
@@ -5,354 +5,129 @@
 <!--        <bnOrderLogList :order-id="orderId" />-->
         <a-button type="primary" @click="fnShowOrderMoney">调整订单金额</a-button>
         <a-button type="primary" @click="fnShowOrderCheck(1)">审核订单</a-button>
-        <!--<a-button v-if="isOutFactory == 1" type="primary" @click="fnShowOrderCheck(2)">复审</a-button>
+        <a-button type="primary" @click="fnShowLog">查看日志</a-button>
         <a-button v-if="!ifEdit" type="primary" :loading="loadOE" @click="BeforeOrderEdit">修改订单</a-button>
-        <a-button v-else @click="ifEdit=false">退出修改</a-button>
+        <template v-else>
+          <a-button type="danger" @click="upOrderEdit">保存修改</a-button>
+          <a-button  @click="escEdit">退出修改</a-button>
+        </template>
+        <!--<a-button v-if="isOutFactory == 1" type="primary" @click="fnShowOrderCheck(2)">复审</a-button>
         <a-button type="primary" v-if="orderStatus<70 && orderStatus>=0 && isOutFactory == 1" :loading="loadOffer" @click="fnPcbOffer">申请外发报价</a-button>
         <bn-set-purchase-status :order-id="orderId" :order-status="orderDetail.orderPurchaseStatus" :getList="getOrderDetail"/>
         <bnOrderCancel :order-id="orderId" />-->
       </div>
-      <template v-if="ifEdit">
-        <div class="titsc"><b>修改PCB订单 No：{{orderDetail.orderNo}}</b></div>
-        <template v-if="orderDetail">
-        <table class="tablesc">
-            <tr>
-              <td class="t">板材品牌</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.coreType">
-                <a-radio-button v-for="(item,index) in typeList.CoreType" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">TG值</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.coreTg">
-                <a-radio-button v-for="(item,index) in typeList.CoreTg" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">宽x高</td><td class="n" colspan="3"><a-input v-model="formPQ.boardWidth" style="width:70px" /> x <a-input v-model="formPQ.boardHeight" style="width:70px"  /> mm</td>
-              <td class="t">数量({{formPQ.boardType}})</td><td class="n" colspan="3"><a-input v-model="formPQ.num"/><span>（小于30必须5的倍数，大于30必须10的倍数）</span></td>
-            </tr>
-            <tr>
-              <td class="t">板层</td>
-              <td class="n" colspan="7">
-                <a-radio-group v-model="formPQ.boardLayers">
-                  <a-radio-button v-for="(item,index) in typeList.BoardLayers" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-                </a-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td class="t">板厚</td>
-              <td class="n" colspan="7">
-                <a-radio-group v-model="formPQ.boardThickness">
-                  <a-radio-button v-for="(item,index) in typeList.BoardThickness" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-                </a-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td class="t">阻焊颜色</td>
-              <td class="n" colspan="3">
-                <a-radio-group v-model="formPQ.solderColor">
-                  <a-radio-button v-for="(item,index) in typeList.SolderColor" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-                </a-radio-group>
-              </td>
-              <td class="t">字符颜色</td>
-              <td class="n" colspan="3">
-                <a-radio-group v-model="formPQ.fontColor">
-                  <a-radio-button v-for="(item,index) in typeList.FontColor" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-                </a-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td class="t">底层阻焊颜色</td>
-              <td class="n" colspan="3">
-                <a-radio-group v-model="formPQ.solderColorBottom">
-                  <a-radio-button v-for="(item,index) in typeList.SolderColor" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-                </a-radio-group>
-              </td>
-              <td class="t">底层字符颜色</td>
-              <td class="n" colspan="3">
-                <a-radio-group v-model="formPQ.fontColorBottom">
-                  <a-radio-button v-for="(item,index) in typeList.FontColor" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-                </a-radio-group>
-              </td>
-            </tr>
-            <tr>
-              <td class="t">阻焊覆盖</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.solderCover">
-                <a-radio-button v-for="(item,index) in typeList.SolderCover" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group>
-            </td>
-              <td class="t">拼板XY</td><td class="n">
-              <a-input v-model="formPQ.pinBanX" style="width:70px" /> x <a-input v-model="formPQ.pinBanY" style="width:70px"  />
-            </td>
-              <td class="t">拼板数量</td><td class="n">
-              <a-input v-model="formPQ.pinBanNum" style="width:70px" />
-            </td>
-            </tr>
-            <tr>
-              <td class="t">工艺边</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.processEdges">
-                <a-radio-button v-for="(item,index) in typeList.ProcessEdges" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">工艺边宽</td><td class="n" colspan="3"><a-input v-model="formPQ.processEdgesWidth" style="width:70px"  /></td>
-            </tr>
-            <tr>
-              <td class="t">V割方式</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.vCut">
-                <a-radio-button v-for="(item,index) in typeList.VCut" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">槽间距(高x宽)</td><td class="n" colspan="3"><a-input v-model="formPQ.grooveHeight" style="width:70px" /> x <a-input v-model="formPQ.grooveWidth" style="width:70px"  /></td>
-            </tr>
-            <tr>
-              <td class="t">铜厚(外层)</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.copperThickness">
-                <a-radio-button v-for="(item,index) in typeList.CopperThickness" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">焊盘表面处理</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.surfaceFinish">
-                <a-radio-button v-for="(item,index) in typeList.SurfaceFinish" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">铜厚(内层)</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.innerCopperThickness">
-                <a-radio-button v-for="(item,index) in typeList.InnerCopperThickness" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">沉金厚度</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.imGoldThinckness">
-                <a-radio-button v-for="(item,index) in typeList.ImGoldThinckness" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">最小孔径</td><td class="n" colspan="7">
-              <a-radio-group v-model="formPQ.vias">
-                <a-radio-button v-for="(item,index) in typeList.Vias" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">最小线宽/线距</td><td class="n" colspan="7">
-              <a-radio-group v-model="formPQ.lineWeight">
-                <a-radio-button v-for="(item,index) in typeList.LineWeight" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">出货类型</td><td class="n">
-              <a-radio-group v-model="formPQ.boardType">
-                <a-radio-button v-for="(item,index) in typeList.BoardType" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">是否接受打叉版</td><td class="n">
-              <a-radio-group v-model="formPQ.acceptCrossed">
-                <a-radio-button v-for="(item,index) in typeList.AcceptCrossed" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">BGA数量</td><td class="n"><a-input v-model="formPQ.bgaNum" style="width:70px" /></td>
-              <td class="t">BGA尺寸</td><td class="n"><a-input v-model="formPQ.bgaSize" style="width:70px" /></td>
-            </tr>
-            <tr>
-              <td class="t">测试方式</td><td class="n" colspan="3">
-              <a-radio-group v-model="formPQ.flyingProbe">
-                <a-radio-button v-for="(item,index) in typeList.FlyingProbe" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">阻抗</td><td class="n">
-              <a-radio-group v-model="formPQ.isImpedance">
-                <a-radio-button v-for="(item,index) in typeList.IsImpedance" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">阻抗报告</td><td class="n">
-              <a-radio-group v-model="formPQ.impedanceReport">
-                <a-radio-button v-for="(item,index) in typeList.ImpedanceReport" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">孔密度</td><td class="n"><a-input v-model="formPQ.boardHoleNum" style="width:70px" /></td>
-              <td class="t">IPCLevel 出货标准</td><td class="n">
-              <a-radio-group v-model="formPQ.ipcLevel">
-                <a-radio-button v-for="(item,index) in typeList.IPCLevel" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">确认生产稿</td><td class="n">
-              <a-radio-group v-model="formPQ.productFileSure">
-                <a-radio-button v-for="(item,index) in typeList.ProductFileSure" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">成型方式</td><td class="n">
-              <a-radio-group v-model="formPQ.formingType">
-                <a-radio-button v-for="(item,index) in typeList.FormingType" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">出货报告</td><td class="n" colspan="5">
-              <a-checkbox-group v-model="formPQ.needReportList">
-                <a-checkbox v-for="(item,index) in typeList.NeedReportList" :key="index" :value="item.dataValue">{{item.caption}}</a-checkbox>
-              </a-checkbox-group></td>
-              <td class="t">CAM高端个性化</td><td class="n">
-              <a-radio-group v-model="formPQ.camEngineer">
-                <a-radio-button v-for="(item,index) in typeList.CamEngineer" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">锣程</td><td class="n"><a-input v-model="formPQ.routLength" style="width:70px" /></td>
-              <td class="t">电镀前工艺</td><td class="n">
-              <a-radio-group v-model="formPQ.beforePlating">
-                <a-radio-button v-for="(item,index) in typeList.BeforePlating" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">更改料号</td><td class="n"><a-input v-model="formPQ.changeItemNum" /></td>
-              <td class="t">更改周期标识</td><td class="n"><a-input v-model="formPQ.changePeriod" /></td>
-            </tr>
-            <tr>
-              <td class="t">线路工艺</td><td class="n">
-              <a-radio-group v-model="formPQ.imageTranster">
-                <a-radio-button v-for="(item,index) in typeList.ImageTranster" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">阻焊工艺</td><td class="n">
-              <a-radio-group v-model="formPQ.solderTransfer">
-                <a-radio-button v-for="(item,index) in typeList.SolderTransfer" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">出货报告材质</td><td class="n">
-              <a-radio-group v-model="formPQ.reportMaterial">
-                <a-radio-button v-for="(item,index) in typeList.ReportMaterial" :key="index" :value="Number(item.dataValue)">{{item.caption}}</a-radio-button>
-              </a-radio-group></td>
-              <td class="t">是否外发</td><td class="n">
-              <a-radio-group v-model="formPQ.isOutFactory">
-                <a-radio-button :value="0">否</a-radio-button>
-                <a-radio-button :value="1">是</a-radio-button>
-              </a-radio-group></td>
-            </tr>
-            <tr>
-              <td class="t">订单备注</td><td class="n" colspan="7"><a-input v-model="formPQ.Note"/></td>
-            </tr>
-            <tr>
-              <td class="t">特殊工艺</td>
-              <td class="n" colspan="7">
-               <template v-for="(item,index) in arrSpecialList">
-                 <div class="boxListSpecials" :key="item.typeNo" v-if="item.valueType==1"><div class="t">{{item.caption}}<em>{{selSL[index].typeName}}</em></div><a-input v-model="selSL[index].typeValue" style="width:100px"/></div>
-                 <div class="boxListSpecials" :key="item.typeNo" v-else><div class="t">{{item.caption}}<em>{{selSL[index].typeName}}</em></div>
-                   <a-radio-group v-model="selSL[index].typeValue">
-                     <a-radio-button v-for="(item,index) in item.processDataList" :key="index" :value="item.dataValue">{{item.caption}}</a-radio-button>
-                   </a-radio-group>
-                 </div>
-               </template>
-              </td>
-            </tr>
-        </table>
-      </template>
-<!--        <a-spin :spinning="loadEdit">-->
-          <div class="boxBn" v-if="ifEdit"><a-button @click="ifEdit=false">退出修改</a-button><a-button :loading="loadEdit" type="danger" @click="upOrderEdit">保存修改</a-button></div>
-<!--        </a-spin>-->
-      </template>
-      <template v-else>
-        <div class="titsc"><b>基本信息</b></div>
-        <template v-if="orderDetail">
-          <ul class="listTable">
-            <li><span class="t">订单编号：</span><p class="n">{{orderDetail.orderNo}}</p></li>
-            <li><span class="t">订单类型：</span><p class="n">{{getSelTxt('orderType',orderDetail.orderType)}}</p></li>
-            <li><span class="t">下单时间：</span><p class="n">{{formatDateTime(orderDetail.createTime)}}</p></li>
-            <li><span class="t">状态：</span><p class="n">{{getSelTxt('orderStatus',orderDetail.status)}}</p></li>
-            <li><span class="t">审单人员：</span><p class="n">{{orderDetail.checkAccountName}}</p></li>
-            <li v-if="orderDetail.sourceType!=4"><span class="t">业务/跟单员：</span><p class="n">/{{orderDetail.followAccount}}</p></li>
-            <li><span class="t">付款情况：</span><p class="n">{{orderDetail.isPay?'已支付':'未支付'}}</p></li>
-          </ul>
-          <div class="titsc"><b>参数信息</b></div>
-          <!--<ul class="listTable">
-            <li><span class="t">尺寸(宽x高)：</span><p class="n">{{orderDetail.deliverWidth}} x {{orderDetail.boardHeight}} cm</p></li>
-            <li><span class="t">数量：</span><p class="n">{{orderDetail.num}}</p></li>
-            <li><span class="t">层数：</span><p class="n">{{orderDetail.boardLayers}}</p></li>
-            <li><span class="t">拼版款数：</span><p class="n">{{orderDetail.pinbanNum}}</p></li>
-            <li><span class="t">阻焊颜色：</span><p class="n">[顶]{{orderDetail.solderColor}} [底]{{orderDetail.solderColorbottom}}</p></li>
-            <li><span class="t">字符：</span><p class="n">[顶]{{orderDetail.fontColor}} [底]{{orderDetail.fontColorBottom}}</p></li>
-            <li><span class="t">过孔处理：</span><p class="n">{{orderDetail.solderCover}}</p></li>
-            <li><span class="t">铜厚(内/外)：</span><p class="n">{{orderDetail.innerCopperThickness+'/'+orderDetail.copperThickness}}</p></li>
-            <li><span class="t">过孔处理：</span><p class="n">{{orderDetail.solderCover}}</p></li>
-            <li><span class="t">板厚：</span><p class="n">{{orderDetail.boardThickness}} mm</p></li>
-            <li><span class="t">表面处理：</span><p class="n"></p></li>
-            <li><span class="t">孔径：</span><p class="n">{{orderDetail.vias}} mm</p></li>
-            <li><span class="t">线宽线距：</span><p class="n">{{orderDetail.lineWeight}}</p></li>
-            <li><span class="t">板材：</span><p class="n">{{orderDetail.fr4Tg}} / {{orderDetail.fr4Type}}</p></li>
-            <li><span class="t">出货类型：</span><p class="n">{{orderDetail.boardType}}</p></li>
-            <li><span class="t">是否接受打叉板：</span><p class="n"></p></li>
-            <li><span class="t">盲埋孔：</span><p class="n">{{orderDetail.isBlindVias}}</p></li>
-            <li><span class="t">BGA数量：</span><p class="n">{{orderDetail.bgaNum}}</p></li>
-            <li><span class="t">GBA尺寸：</span><p class="n">{{orderDetail.bgaSize}}</p></li>
-            <li><span class="t">金手指倒斜边：</span><p class="n">{{orderDetail.goldFinger}}</p></li>
-            <li><span class="t">阻抗：</span><p class="n">{{orderDetail.impedanceSize}}</p></li>
-            <li><span class="t">阻抗报告：</span><p class="n">{{orderDetail.impedanceReport}}</p></li>
-            <li><span class="t">耐压值：</span><p class="n">{{orderDetail.withstandVoltage}}</p></li>
-            <li><span class="t">耐压测试：</span><p class="n"></p></li>
-            <li><span class="t">导热系数：</span><p class="n">{{orderDetail.invoice}}</p></li>
-            <li><span class="t">是否加急：</span><p class="n">{{orderDetail.isJiaJi}}</p></li>
-            <li><span class="t">是否返单：</span><p class="n">{{orderDetail.isReorder}}</p></li>
-            <li><span class="t">客户文件：</span><p class="n"><a :href="orderDetail.pcbFilePath" target="_blank" :title="orderDetail.pcbFileName">{{orderDetail.pcbFileName}}</a></p></li>
-            <li><span class="t">测试：</span><p class="n">{{orderDetail.flyingProbe}}</p></li>
-            <li><span class="t">客户备注：</span><p class="n">{{orderDetail.note}}</p></li>
-            <li><span class="t">工程文件：</span><p class="n"></p></li>
-            <li><span class="t">电镀前工艺：</span><p class="n"></p></li>
-            <li><span class="t">V割类型：</span><p class="n">{{orderDetail.vcut}}</p></li>
-            <li><span class="t">自定义编号：</span><p class="n"></p></li>
-            <li><span class="t">成型方式：</span><p class="n">{{orderDetail.formingType}}</p></li>
-            <li><span class="t">半孔：</span><p class="n">{{orderDetail.halfHole}}</p></li>
-            <li><span class="t">出货标准：</span><p class="n">{{orderDetail.ipcLevel}}</p></li>
-            <li><span class="t">是否外发：</span><p class="n">{{orderDetail.isOutFactory}}</p></li>
-            <li><span class="t">重量：</span><p class="n"></p></li>
-            <li><span class="t">锣程：</span><p class="n">{{orderDetail.routLength}}</p></li>
-            <li><span class="t">线路工艺：</span><p class="n"></p></li>
-            <li><span class="t">阻焊工艺：</span><p class="n"></p></li>
-            <li><span class="t">孔密度：</span><p class="n">{{orderDetail.holeDensity}}</p></li>
-            <li><span class="t">拼版利用率：</span><p class="n"></p></li>
-            <li><span class="t">出货报告材质：</span><p class="n">{{orderDetail.reportMaterial}}</p></li>
-            <li><span class="t">出货报告：</span><p class="n">{{orderDetail.surfaceFinish}}</p></li>
-            <li><span class="t">是否确认生产稿：</span><p class="n"></p></li>
-            <li><span class="t">工程师级别：</span><p class="n">{{orderDetail.camEngineer}}</p></li>
-            <li><span class="t">供应商编码：</span><p class="n"></p></li>
-            <li><span class="t">更改周期标识：</span><p class="n"></p></li>
-            <li><span class="t">更改料号：</span><p class="n"></p></li>
-            <li><span class="t">券编号：</span><p class="n"></p></li>
-            <li><span class="t">审核备注：</span><p class="n"></p></li>
-            <li><span class="t">业务员备注：</span><p class="n">{{orderDetail.cnNote}}</p></li>
-            <li><span class="t">订单包备注：</span><p class="n">{{orderDetail.orderMainNote}}</p></li>
-            <li><span class="t">退单备注：</span><p class="n"></p></li>
-          </ul>-->
-          <ul class="listTable">
-            <li><span class="t">尺寸(宽x高)：</span><p class="n">{{orderDetail.deliverWidth}} x {{orderDetail.boardHeight}} mm</p></li>
-            <li><span class="t">阻焊颜色：</span><p class="n"><span style="color:#f90">[顶]</span> {{orderDetail.solderColor}} <span style="color:#a9a774">[底]</span> {{orderDetail.solderColorbottom}}</p></li>
-            <li><span class="t">字符：</span><p class="n"><span style="color:#f90">[顶]</span> {{orderDetail.fontColor}} <span style="color:#a9a774">[底]</span> {{orderDetail.fontColorBottom}}</p></li>
-            <li><span class="t">客户文件：</span><p class="n"><a :href="orderDetail.pcbFilePath" target="_blank" :title="orderDetail.pcbFileName"><a-icon type="cloud-download" style="color:#0fb8ee" /> {{orderDetail.pcbFileName}}</a></p></li>
-            <template  v-for="(item,index) in resOrdDetail">
-              <li :key="index" v-if="item.isShow"><span class="t" :dataKey="item.key">{{item.name}}：</span><p class="n">{{item.value}}</p></li>
-            </template>
-          </ul>
-        </template>
-        <!--<div class="boxKH20"></div>
-        <div class="titsc"><b>特殊工艺信息</b></div>
-        <table class="tablesa">
-          <tr v-for="(item,index) in pcbDetail.pcbSpecialProcessData" :key="index">
-            <td class="t">{{item.typeName}}</td>
-            <td colspan="7">{{item.typeValue}}</td>
-          </tr>
-        </table>-->
+      <div class="titsc"><b>基本信息</b></div>
+      <template v-if="orderDetail">
+        <ul class="listTable">
+          <li><span class="t">订单编号：</span><p class="n">{{orderDetail.orderNo}}</p></li>
+          <li><span class="t">订单类型：</span><p class="n">{{getSelTxt('orderType',orderDetail.orderType)}}</p></li>
+          <li><span class="t">下单时间：</span><p class="n">{{formatDateTime(orderDetail.createTime)}}</p></li>
+          <li><span class="t">状态：</span><p class="n">{{getSelTxt('orderStatus',orderDetail.status)}}</p></li>
+          <li><span class="t">审单人员：</span><p class="n">{{orderDetail.checkAccountName}}</p></li>
+          <li v-if="orderDetail.sourceType!=4"><span class="t">业务/跟单员：</span><p class="n">/{{orderDetail.followAccount}}</p></li>
+          <li><span class="t">付款情况：</span><p class="n">{{orderDetail.isPay?'已支付':'未支付'}}</p></li>
+        </ul>
+        <div class="titsc"><b>参数信息</b></div>
+        <ul class="listTable">
+          <li><span class="t">尺寸(宽x高)：</span>
+            <p class="n">{{orderDetail.deliverWidth}} x {{orderDetail.boardHeight}} mm</p>
+<!--            <p class="n" v-else><a-input suffix="mm" v-model="orderParams.deliverWidth" style="min-width:6em; width:40%;"/> x <a-input suffix="mm" v-model="orderParams.boardHeight" style="min-width:6em; width:40%;"/></p>-->
+          </li>
+          <li><span class="t">阻焊颜色：</span>
+            <p class="n"><span style="color:#f90">[顶]</span> {{orderDetail.solderColor}} <span style="color:#a9a774">[底]</span> {{orderDetail.solderColorbottom}}</p>
+<!--            <p class="n" v-else>-->
+<!--              <a-select v-model="orderParams.solderColor" style="width: 100px">-->
+<!--                <a-select-option value="" disabled>【顶部】</a-select-option>-->
+<!--                <a-select-option v-for="(li,index) in resEditPP('SolderColor')" :key="index" :value="li.value">{{li.name}}</a-select-option>-->
+<!--              </a-select>-->
+<!--              <a-select v-model="orderParams.solderColorbottom" style="width: 100px">-->
+<!--                <a-select-option value="" disabled>【底部】</a-select-option>-->
+<!--                <a-select-option v-for="(li,index) in resEditPP('SolderColor')" :key="index" :value="li.value">{{li.name}}</a-select-option>-->
+<!--              </a-select>-->
+<!--            </p>-->
+          </li>
+          <li><span class="t">字符：</span>
+            <p class="n"><span style="color:#f90">[顶]</span> {{orderDetail.fontColor}} <span style="color:#a9a774">[底]</span> {{orderDetail.fontColorBottom}}</p>
+<!--            <p class="n" v-else>-->
+<!--              <a-select v-model="orderParams.fontColor" style="width: 100px">-->
+<!--                <a-select-option value="" disabled>【顶部】</a-select-option>-->
+<!--                <a-select-option v-for="(li,index) in resEditPP('fontColor')" :key="index" :value="li.value">{{li.name}}</a-select-option>-->
+<!--              </a-select>-->
+<!--              <a-select v-model="orderParams.fontColorBottom" style="width: 100px">-->
+<!--                <a-select-option value="" disabled>【底部】</a-select-option>-->
+<!--                <a-select-option v-for="(li,index) in resEditPP('fontColor')" :key="index" :value="li.value">{{li.name}}</a-select-option>-->
+<!--              </a-select>-->
+<!--            </p>-->
+          </li>
+          <li><span class="t">客户文件：</span><p class="n"><a :href="orderDetail.pcbFilePath" target="_blank" :title="orderDetail.pcbFileName"><a-icon type="cloud-download" style="color:#0fb8ee" /> {{orderDetail.pcbFileName}}</a></p></li>
+          <template  v-for="(item,index) in resOrdDetail">
+            <li :key="index" v-if="item.isShow" :class="{edit:ifEdit && item.isEdit}"><span class="t" :dataKey="item.key">{{item.name}}：</span>
+              <p class="n" v-if="!ifEdit || !item.isEdit">{{item.value}}</p>
+              <p class="n" v-else>
+                <template v-if="item.type == 'choose'">
+                  <a-select v-model="orderParams[item.key]" style="width:100%">
+                    <a-select-option v-for="(li,index) in resEditPP(item.children,typeof orderParams[item.key])" :key="index" :value="li.value">{{li.name}}</a-select-option>
+                  </a-select>
+                </template>
+                <template v-else-if="item.type == 'str'">
+                  <a-input v-model="orderParams[item.key]" style="width:100%" />
+                </template>
+                <template v-else-if="item.type == 'Double' || item.type == 'number'">
+                  <a-input-number v-model="orderParams[item.key]" style="width:100%" />
+                </template>
+                <template v-else-if="item.type == 'whether'">
+                  <a-radio-group button-style="solid" v-model="orderParams[item.key]">
+                    <a-radio-button :value="true">是</a-radio-button>
+                    <a-radio-button :value="false">否</a-radio-button>
+                  </a-radio-group>
+                </template>
+                <template v-else>
+                  {{item.key}}=={{item.type}}=={{orderParams[item.key]}}=={{typeof orderParams[item.key]}}
+                  {{resEditPP(item.children)}}
+                </template>
+              </p>
+            </li>
+          </template>
+        </ul>
+        <div class="bnCenter" v-if="ifEdit">
+          <a-button type="primary" @click="upOrderEdit">保存修改</a-button>
+          <a-button @click="escEdit">退出修改</a-button>
+        </div>
       </template>
+      <!--<div class="boxKH20"></div>
+      <div class="titsc"><b>特殊工艺信息</b></div>
+      <table class="tablesa">
+        <tr v-for="(item,index) in pcbDetail.pcbSpecialProcessData" :key="index">
+          <td class="t">{{item.typeName}}</td>
+          <td colspan="7">{{item.typeValue}}</td>
+        </tr>
+      </table>-->
     </a-spin>
     <a-modal title="审核订单" :visible="showOC" :confirm-loading="confirmSubmit" @ok="$refs.formOC.fnOrderCheck()" @cancel="showOC = false" width="700px">
       <orderCheck :isAlt="true" :orderInfo="orderDetail" :orderId="orderId" ref="formOC"></orderCheck>
     </a-modal>
     <orderMoney :showAlt="showSetOrderMoney" :fnHiddenAlt="fnHideOrderMoney" :sourceType="orderDetail.sourceType" :orderId="orderId" ref="formMoney"></orderMoney>
+    <altLog ref="altLog"></altLog>
   </div>
 </template>
 
 <script>
-import {
-  QuotePcbProcessType,
-  OrderPcbEditDetail,
-  putOrderPcb, OrderDetail,OrderParamDetail
-} from "@/services/order/Order";
+import {OrderDetail, OrderParamDetail, checkByOrder} from "@/services/order/Order";
 import {formatDate, resSelects} from "@/services/Common";
 import orderCheck from "@/pages/order/orderCheck";
 import orderMoney from "@/pages/order/orderMoney";
-// import bnOrderLogList from "@/pages/Common/bnOrderLogList";
+import altLog from "@/pages/Common/altLog";
 // import bnOrderCancel from "@/pages/Common/bnOrderCancel";
 // import BnSetPurchaseStatus from "@/pages/Common/bnSetPurchaseStatus";
 
 export default {
   name: 'PcbDetail',
-  components: {orderCheck,orderMoney},
+  components: {orderCheck,orderMoney,altLog},
   // components: {bnOrderLogList,bnOrderCancel,BnSetPurchaseStatus},
   data(){
     return{
       loadPage:true,confirmSubmit:false,loadOE:false,ifEdit:false,loadEdit:false,loadOffer:false,
-      orderId:'',orderStatus:0,orderDetail:{},pcbDetail:{},isOutFactory:'',
+      orderId:'',orderStatus:0,orderDetail:{},orderParams:{},pcbDetail:{},isOutFactory:'',
       layout:{labelCol:{span:5},wrapperCol:{span:19},},
       formPQ:{},typeList:{},arrSpecialList:[],selSL:[],
       formOrderMoney:{},
@@ -370,599 +145,24 @@ export default {
     fnShowOrderCheck(key){
       this.showOC = true;
     },
+    //获取订单详情+解析参数
     async getOrderDetail(){
       this.loadPage = true;
       //跳过处理参数
       let noFEArr = ['orderNo','orderType','createTime','status','checkAccountName','followAccount','isPay'];
       //隐藏参数
-      let noPEArr = ['pcbFileName','pcbFilePath','deliverWidth','boardHeight'];
+      let noPEArr = ['pcbFileName','pcbFilePath','deliverWidth','boardHeight','solderColor','fontColor','fontColorBottom','solderColorbottom'];
       let noPEtxtArr = ['solderColor','fontColor','fontColorBottom','solderColorbottom'];
+      //显示可编辑
+      let isEditParams = ['fr4Type','fr4Tg','flyingProbe','isOutFactory','holeDensity','routLength','reOrderNo','cnNote'];
       //参数信息循环处理
       this.resOrdDetail = [];
-      // let res = {
-      //   "sourceType": "2",
-      //   "orderType": 2,
-      //   "orderNo": "201672127390798458",
-      //   "groupNo": "201672127390798458",
-      //   "memberNo": "1088",
-      //   "memberLevel": 0,
-      //   "orderMainNote": "",
-      //   "isWenKe": false,
-      //   "isPay": false,
-      //   "createTime": "2022-12-27T15:49:50.8",
-      //   "pinbanNum": 1,
-      //   "num": 1000,
-      //   "note": "",
-      //   "pcbFileName": "j2w-2058139_202102261104026992886432467m12pc.zip",
-      //   "pcbFilePath": "https://jpfile1.oss-cn-shenzhen.aliyuncs.com/project/jingmisite/8260279d27727f5ca1bf3a0864b7c00a/orderfiles/20221227/j2w-2058139_202102261104026992886432467m12pc.zip",
-      //   "isJiaJi": false,
-      //   "isReorder": false,
-      //   "reOrderNo": "",
-      //   "status": 0,
-      //   "parsingStatus": 0,
-      //   "orderMoney": 14641.4,
-      //   "isTeJia": false,
-      //   "cnNote": null,
-      //   "deliverHeight": 100,
-      //   "deliverWidth": 100,
-      //   "holeDensity": 0,
-      //   "boardWidth": 100,
-      //   "boardHeight": 100,
-      //   "boardThickness": 1.6,
-      //   "boardLayers": 2,
-      //   "solderColor": "green",
-      //   "solderCover": "openwindow",
-      //   "fontColor": "white",
-      //   "copperThickness": 1,
-      //   "flyingProbe": "full",
-      //   "vias": 0.15,
-      //   "lineWeight": 4,
-      //   "fr4Tg": "tg150",
-      //   "fr4Type": "fr4",
-      //   "boardType": "pcs",
-      //   "halfHole": 0,
-      //   "invoice": 1,
-      //   "innerCopperThickness": 1,
-      //   "bgaNum": 0,
-      //   "pinBanType": "1x1",
-      //   "processEdges": "none:0",
-      //   "bgaSize": 0,
-      //   "vcut": "none",
-      //   "impedanceReport": 0,
-      //   "impedanceSize": 0,
-      //   "goldFinger": 0,
-      //   "boardArea": 10,
-      //   "solderColorbottom": "green",
-      //   "fontColorBottom": "white",
-      //   "grooveHeight": 0,
-      //   "grooveWidth": 0,
-      //   "pcsNum": 1000,
-      //   "ipcLevel": 0,
-      //   "camEngineer": "3",
-      //   "aluminumType": "",
-      //   "withstandVoltage": 0,
-      //   "formingType": "mechanical",
-      //   "routLength": 0,
-      //   "imageTranster": "exposure",
-      //   "pcbSetNum": 0,
-      //   "utilizationRate": 0,
-      //   "wvTest": "none",
-      //   "vipFlag": 1,
-      //   "checkAccountName": "测试",
-      //   "followAccount": null,
-      //   "reportMaterial": "WQ,EPTR",
-      //   "boardHoleNum": null,
-      //   "processEdgesWidth": null,
-      //   "isOutFactory": null,
-      //   "surfaceFinish": null,
-      //   "gilding": null,
-      //   "isBlindVias": null,
-      //   "isBoard": null,
-      //   "specialExt": [
-      //     {
-      //       "BoardViasRatio": "1"
-      //     },
-      //     {
-      //       "SpecialPinBan": "0"
-      //     },
-      //     {
-      //       "LightPlatesNum": "0"
-      //     },
-      //     {
-      //       "Backdrilling": "0"
-      //     },
-      //     {
-      //       "HoleWallCuThickness": "1"
-      //     },
-      //     {
-      //       "PalladiumThickness": ""
-      //     },
-      //     {
-      //       "FineLine": "0"
-      //     },
-      //     {
-      //       "ProfiledHoleNum": "0"
-      //     },
-      //     {
-      //       "ULType": "0"
-      //     }
-      //   ]
-      // }
-      // let resOP = [
-      //   {
-      //     "name": "订单来源",
-      //     "type": "str",
-      //     "key": "SourceType",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "审核人员账号",
-      //     "type": "str",
-      //     "key": "CheckAccount",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "跟单人员账号",
-      //     "type": "str",
-      //     "key": "FollowAccount",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "订单类型",
-      //     "type": "choose",
-      //     "key": "OrderType",
-      //     "value": "[{\r\n  \"1\": \"样板\",\r\n  \"2\": \"批量\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "订单号",
-      //     "type": "str",
-      //     "key": "OrderNo",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "订单包号",
-      //     "type": "str",
-      //     "key": "GroupNo",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "客户编号",
-      //     "type": "str",
-      //     "key": "MemberNo",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "客户等级",
-      //     "type": "number",
-      //     "key": "MemberLevel",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "订单包备注",
-      //     "type": "str",
-      //     "key": "OrderMainNote",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "是否问客",
-      //     "type": "whether",
-      //     "key": "IsWenKe",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "是否已支付",
-      //     "type": "whether",
-      //     "key": "IsPay",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "创建时间",
-      //     "type": "str",
-      //     "key": "CreateTime",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "拼版数",
-      //     "type": "number",
-      //     "key": "PinbanNum",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "数量",
-      //     "type": "number",
-      //     "key": "Num",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "客户备注",
-      //     "type": "str",
-      //     "key": "Note",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "文件名",
-      //     "type": "str",
-      //     "key": "PcbFileName",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "源文件存放路径",
-      //     "type": "str",
-      //     "key": "PcbFilePath",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "是否加急",
-      //     "type": "choose",
-      //     "key": "IsJiaJi",
-      //     "value": "[{\r\n  \"24 小时\": \"24 小时\",\r\n  \"48 小时\": \"48 小时\",\r\n  \"72 小时\": \"72 小时\",\r\n  \"96 小时\": \"96 小时\",\r\n  \"2-3 天\": \"2-3 天\",\r\n  \"2-4 天\": \"2-4 天\",\r\n  \"3-4 天\": \"3-4 天\",\r\n  \"4-5 天\": \"4-5 天\",\r\n  \"5-6 天\": \"5-6 天\",\r\n  \"6-7 天\": \"6-7 天\",\r\n  \"7-8 天\": \"7-8 天\",\r\n  \"8-9 天\": \"8-9 天\",\r\n  \"9-10 天\": \"9-10 天\",\r\n  \"10-11 天\": \"10-11 天\",\r\n  \"11-12 天\": \"11-12 天\",\r\n  \"12-13 天\": \"12-13 天\",\r\n  \"13-14 天\": \"13-14 天\",\r\n  \"14-15 天\": \"14-15 天\",\r\n  \"15-16 天\": \"15-16 天\",\r\n  \"16-17 天\": \"16-17 天\",\r\n  \"17-18 天\": \"17-18 天\",\r\n  \"18-19 天\": \"18-19 天\",\r\n  \"19-20 天\": \"19-20 天\",\r\n  \"0\": \"否\",\r\n  \"1\": \"是\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "是否返单",
-      //     "type": "whether",
-      //     "key": "IsReorder",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "返单号",
-      //     "type": "str",
-      //     "key": "ReOrderNo",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "状态",
-      //     "type": "number",
-      //     "key": "Status",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "解析状态",
-      //     "type": "number",
-      //     "key": "ParsingStatus",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "订单金额",
-      //     "type": "Double",
-      //     "key": "OrderMoney",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "是否特价",
-      //     "type": "whether",
-      //     "key": "IsTeJia",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "业务员备注",
-      //     "type": "str",
-      //     "key": "CnNote",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "成品宽",
-      //     "type": "Double",
-      //     "key": "DeliverHeight",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "成品高",
-      //     "type": "Double",
-      //     "key": "DeliverWidth",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "孔密度",
-      //     "type": "Double",
-      //     "key": "HoleDensity",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "板宽",
-      //     "type": "Double",
-      //     "key": "BoardWidth",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "板高",
-      //     "type": "Double",
-      //     "key": "BoardHeight",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "板厚",
-      //     "type": "choose",
-      //     "key": "BoardThickness",
-      //     "value": "[{\r\n  \"0.4\": \"0.4mm\",\r\n  \"0.6\": \"0.6mm\",\r\n  \"0.8\": \"0.8mm\",\r\n  \"1.0\": \"1.0mm\",\r\n  \"1.2\": \"1.2mm\",\r\n  \"1.6\": \"1.6mm\",\r\n  \"1.8\": \"1.8mm\",\r\n  \"2.2\": \"2.0mm\",\r\n  \"2.0\": \"2.2mm\",\r\n  \"2.4\": \"2.4mm\",\r\n  \"2.8\": \"2.8mm\",\r\n  \"3\": \"3.0mm\",\r\n  \"3.2\": \"3.2mm\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "板层",
-      //     "type": "choose",
-      //     "key": "BoardLayers",
-      //     "value": "[{\r\n  \"1\": \"1层\",\r\n  \"2\": \"2层\",\r\n  \"4\": \"4层\",\r\n  \"6\": \"6层\",\r\n  \"8\": \"8层\",\r\n  \"10\": \"10层\",\r\n  \"12\": \"12层\",\r\n  \"14\": \"14层\",\r\n  \"16\": \"16层\",\r\n  \"18\": \"18层\",\r\n  \"20\": \"20层\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "顶层阻焊颜色",
-      //     "type": "choose",
-      //     "key": "SolderColor",
-      //     "value": "[{\r\n  \"green\": \"绿色\",\r\n  \"mattegreen\": \"哑光绿\",\r\n  \"red\": \"红色\",\r\n  \"blue\": \"蓝色\",\r\n  \"yellow\": \"黄色\",\r\n  \"black\": \"黑色\",\r\n  \"matteblack\": \"哑光黑\",\r\n  \"white\": \"白色\",\r\n  \"none\": \"无\",\r\n  \"warmwhite\": \"暖白色\",\r\n  \"whitesfr6ks\": \"高反白色\",\r\n  \"coffee\": \"咖啡色\",\r\n  \"bluewhite\": \"冷白色（偏蓝）\",\r\n  \"greenht\": \"绿色（红太系列）\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "过孔处理",
-      //     "type": "choose",
-      //     "key": "SolderCover",
-      //     "value": "[{\r\n  \"openwindow\": \"开窗\",\r\n  \"converoil\": \"盖油\",\r\n  \"plugoil\": \"塞油墨\",\r\n  \"resinplughole\": \"塞树脂\",\r\n  \"aluminumplughole\": \"铝片塞孔\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "顶层字符颜色",
-      //     "type": "choose",
-      //     "key": "FontColor",
-      //     "value": "[{\r\n  \"white\": \"白色\",\r\n  \"black\": \"黑色\",\r\n  \"yellow\": \"黄色\",\r\n  \"none\": \"无\",\r\n  \"green\": \"绿色\",\r\n  \"red\": \"红色\",\r\n  \"blue\": \"蓝色\",\r\n  \"matteblack\": \"亚光黑\",\r\n  \"mattegreen\": \"亚光绿\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "铜厚",
-      //     "type": "choose",
-      //     "key": "CopperThickness",
-      //     "value": "[{\r\n  \"0.5\": \"0.5oz\",\r\n  \"0.75\": \"0.75oz\",\r\n  \"1\": \"1oz\",\r\n  \"2\": \"2oz\",\r\n  \"3\": \"3oz\",\r\n  \"1.5\": \"1.5oz\",\r\n  \"0.4\": \"0.4Oz\",\r\n  \"4\": \"4oz\",\r\n  \"5\": \"5oz\",\r\n  \"6\": \"6oz\",\r\n  \"7\": \"7oz\",\r\n  \"8\": \"8oz\",\r\n  \"9\": \"9oz\",\r\n  \"10\": \"10oz\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "测试方法",
-      //     "type": "choose",
-      //     "key": "FlyingProbe",
-      //     "value": "[{\r\n  \"full\": \"飞针全测\",\r\n  \"lowrfull\": \"四线低阻飞针全测\",\r\n  \"teststand\": \"测试架\",\r\n  \"aoi\": \"100%AOI\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "孔径",
-      //     "type": "choose",
-      //     "key": "Vias",
-      //     "value": "[{\r\n  \"0.15\": \"0.15mm\",\r\n  \"0.2\": \"0.2mm\",\r\n  \"0.25\": \"0.25mm\",\r\n  \"0.3\": \"0.3mm\",\r\n  \"0.35\": \"0.35mm\",\r\n  \"0.4\": \"0.4mm\",\r\n  \"0.5\": \"0.5mm\",\r\n  \"0.6\": \"0.6mm\",\r\n  \"0.7\": \"0.7mm\",\r\n  \"0.8\": \"0.8mm↑\",\r\n  \"1\": \"1.0mm\",\r\n  \"1.2\": \"1.2mm\",\r\n  \"1.5\": \"1.5mm↑\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "线宽",
-      //     "type": "choose",
-      //     "key": "LineWeight",
-      //     "value": "[{\r\n  \"20\": \"20/20mil↑\",\r\n  \"10\": \"10/10mil↑\",\r\n  \"8\": \"8/8mil↑\",\r\n  \"6\": \"6/6mil↑\",\r\n  \"5\": \"5/5mil\",\r\n  \"4\": \"4/4mil\",\r\n  \"3.5\": \"3.5/3.5mil\",\r\n  \"3\": \"3/3mil\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "板材Tg值",
-      //     "type": "choose",
-      //     "key": "Fr4Tg",
-      //     "value": "[{\r\n  \"tg130\": \"TG130\",\r\n  \"tg150\": \"TG150\",\r\n  \"tg170\": \"TG170\",\r\n  \"tg135\": \"TG135\",\r\n  \"tg140\": \"TG140\",\r\n  \"tg125\": \"TG125\",\r\n  \"tg280\": \">280\",\r\n  \"110\": \"≥110\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "板材类型",
-      //     "type": "choose",
-      //     "key": "Fr4Type",
-      //     "value": "[{\r\n  \"fr4\": \"FR-4 生益\",\r\n  \"fr4mtg\": \"FR-4(中TG)\",\r\n  \"fr4htg\": \"FR-4(高TG)\",\r\n  \"cem1\": \"CEM-1建滔黄芯\",\r\n  \"aluminum\": \"国纪铝基板\",\r\n  \"gzaluminum\": \"广州铝基板\",\r\n  \"fr4pyab1\": \"FR-4普源\",\r\n  \"ny\": \"FR-4南亚\",\r\n  \"fr4hzh150\": \"FR-4华正\",\r\n  \"fr1jt\": \"FR-1建涛\",\r\n  \"cem3jt\": \"CEM-3建涛\",\r\n  \"22fjt\": \"22F建涛\",\r\n  \"94hbjt\": \"94HB建涛\",\r\n  \"xtaluminum\": \"鑫泰铝基板\",\r\n  \"94hbwlb\": \"94HB威利邦\",\r\n  \"22fwlb94v0\": \"22F威利邦94V0\",\r\n  \"cem1wlb\": \"CME-1威利邦\",\r\n  \"qxaluminum\": \"台湾清晰铝基板\",\r\n  \"22fjtw\": \"22F建滔（白）\",\r\n  \"94hbmk\": \"94HB明康\",\r\n  \"22fpzw\": \"22F鹏州（白）\",\r\n  \"22fpzy\": \"22F鹏州（黄）\",\r\n  \"22fjb\": \"22F金宝\",\r\n  \"fr4hrx\": \"FR-4宏瑞兴\",\r\n  \"f4hrxab\": \"宏瑞兴FR-4 AB级\",\r\n  \"rogers4003c\": \"罗杰斯/RO4003C\",\r\n  \"rogers4350b\": \"罗杰斯/RO4350B\",\r\n  \"cem1jtw\": \"CEM-1建涛白芯\",\r\n  \"22fwlbvi\": \"22F威利邦/22FVI\",\r\n  \"fr4jxa3\": \"FR-4俊萱A3（非阻燃）\",\r\n  \"fr4yja3\": \"FR-4元集A3（非阻燃）\",\r\n  \"fr4fzrrandom\": \"非阻燃不指定板材\",\r\n  \"fr4gjab01\": \"FR-4国纪GF21系列AB0\",\r\n  \"byaluminum\": \"广东博钰铝基板\",\r\n  \"fr4jt\": \"FR-4 建涛\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "出货类型",
-      //     "type": "choose",
-      //     "key": "BoardType",
-      //     "value": "[{\r\n  \"pcs\": \"单片\",\r\n  \"set\": \"拼版(客户自拼)\",\r\n  \"jpset\": \"拼版(51代拼)\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "半孔",
-      //     "type": "choose",
-      //     "key": "HalfHole",
-      //     "value": "[{\r\n  \"0\": \"0边\",\r\n  \"1\": \"1边\",\r\n  \"2\": \"2边\",\r\n  \"3\": \"3边\",\r\n  \"4\": \"4边\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "导热系数",
-      //     "type": "number",
-      //     "key": "Invoice",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "内层铜厚",
-      //     "type": "choose",
-      //     "key": "InnerCopperThickness",
-      //     "value": "[{\r\n  \"0.5\": \"0.5oz\",\r\n  \"0.75\": \"0.75oz\",\r\n  \"1\": \"1oz\",\r\n  \"2\": \"2oz\",\r\n  \"3\": \"3oz\",\r\n  \"4\": \"4oz\",\r\n  \"5\": \"5oz\",\r\n  \"6\": \"6oz\",\r\n  \"7\": \"7oz\",\r\n  \"8\": \"8oz\",\r\n  \"9\": \"9oz\",\r\n  \"10\": \"10oz\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "BGA数量",
-      //     "type": "number",
-      //     "key": "BGANum",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "拼版类型",
-      //     "type": "str",
-      //     "key": "PinBanType",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "工艺边",
-      //     "type": "choose",
-      //     "key": "ProcessEdges",
-      //     "value": "[{\r\n  \"none\": \"无\",\r\n  \"updown\": \"上下方向\",\r\n  \"leftright\": \"左右方向\",\r\n  \"both\": \"四边方向\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "BGA大小",
-      //     "type": "number",
-      //     "key": "BGASize",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "V割类型",
-      //     "type": "choose",
-      //     "key": "Vcut",
-      //     "value": "[{\r\n  \"none\": \"无\",\r\n  \"vcut\": \"V割\",\r\n  \"luocao\": \"锣槽\",\r\n  \"vcutluocao\": \"V割+锣槽\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "阻抗报告",
-      //     "type": "number",
-      //     "key": "ImpedanceReport",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "阻抗大小",
-      //     "type": "number",
-      //     "key": "ImpedanceSize",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "金手指",
-      //     "type": "number",
-      //     "key": "GoldFinger",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "板面积",
-      //     "type": "Double",
-      //     "key": "BoardArea",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "底层阻焊颜色",
-      //     "type": "str",
-      //     "key": "SolderColorbottom",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "底层字符颜色",
-      //     "type": "str",
-      //     "key": "FontColorBottom",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "槽高",
-      //     "type": "Double",
-      //     "key": "GrooveHeight",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "槽宽",
-      //     "type": "Double",
-      //     "key": "GrooveWidth",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "单片数",
-      //     "type": "number",
-      //     "key": "PcsNum",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "IPC等级",
-      //     "type": "choose",
-      //     "key": "IPCLevel",
-      //     "value": "[{\r\n  \"0\": \"否\",\r\n  \"2\": \"3级标\",\r\n  \"1\": \"国军标\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "工程师等级",
-      //     "type": "str",
-      //     "key": "CamEngineer",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "铝基板类型",
-      //     "type": "str",
-      //     "key": "AluminumType",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "耐受电压值",
-      //     "type": "number",
-      //     "key": "WithstandVoltage",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "成型方式",
-      //     "type": "str",
-      //     "key": "FormingType",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "锣长",
-      //     "type": "Double",
-      //     "key": "RoutLength",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "图形工艺",
-      //     "type": "str",
-      //     "key": "ImageTranster",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "数量",
-      //     "type": "number",
-      //     "key": "PcbSetNum",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "利用率",
-      //     "type": "Double",
-      //     "key": "UtilizationRate",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "测试方式",
-      //     "type": "str",
-      //     "key": "WVTest",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "大客标记",
-      //     "type": "number",
-      //     "key": "VipFlag",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "报告类型",
-      //     "type": "str",
-      //     "key": "ReportMaterial",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "机械孔数",
-      //     "type": "number",
-      //     "key": "BoardHoleNum",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "工艺边宽",
-      //     "type": "Double",
-      //     "key": "ProcessEdgesWidth",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "是否外发",
-      //     "type": "whether",
-      //     "key": "IsOutFactory",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "表面处理",
-      //     "type": "choose",
-      //     "key": "SurfaceFinish",
-      //     "value": "[{\r\n  \"none\": \"无\",\r\n  \"haslwithfree\": \"无铅喷锡\",\r\n  \"immersiongold\": \"沉金\",\r\n  \"hardgold\": \"镀金\",\r\n  \"osp\": \"OSP\",\r\n  \"immersiontin\": \"沉锡\",\r\n  \"immersionsilver\": \"沉银\",\r\n  \"eletrolyticnickelgod\": \"化学镍钯金\",\r\n  \"immersiongoldandosp\": \"沉金+OSP\",\r\n  \"haslwithlead\": \"有铅喷锡\"\r\n}]"
-      //   },
-      //   {
-      //     "name": "金面积",
-      //     "type": "Double",
-      //     "key": "Gilding",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "盲埋孔",
-      //     "type": "whether",
-      //     "key": "IsBlindVias",
-      //     "value": null
-      //   },
-      //   {
-      //     "name": "是否有库存",
-      //     "type": "whether",
-      //     "key": "IsBoard",
-      //     "value": null
-      //   }
-      // ]
 
       let res = await OrderDetail(this.orderId);
       let resOP = await OrderParamDetail(this.orderId);
+      this.orderParams = {...res.data};
       res = res.data;
-      resOP = resOP.data;
+      this.PcbProcessType = resOP = resOP.data;
 
       let isShow = true;
       for(let i in res){
@@ -983,156 +183,167 @@ export default {
               opVal = res[i];
               // console.log(resOP[v].name,res[i])
             }
-            this.resOrdDetail.push({key:i,name:resOP[v].name,value:opVal,isShow:isShow,})
+            let isEdit = isEditParams.indexOf(i)>=0;
+            this.resOrdDetail.push({key:i,name:resOP[v].name,value:opVal,isShow:isShow,isEdit:isEdit,type:resOP[v].type,children:arrVal})
           }
         }
       }
       this.orderDetail = res;
       this.loadPage = false;
     },
-    //修改订单
+    //展示修改订单
     async BeforeOrderEdit(){
-      this.loadOE = true;
-
-      this.PcbProcessType = await QuotePcbProcessType(this.orderDetail.tenantId);
-      let resOPED = await OrderPcbEditDetail(this.orderId);
-      this.typeList={
-        BoardLayers:this.resEditPP('BoardLayers'),
-        BoardThickness:this.resEditPP('BoardThickness'),
-        SolderColor:this.resEditPP('SolderColor'),
-        FontColor:this.resEditPP('FontColor'),
-        SolderCover:this.resEditPP('SolderCover'),
-        ProcessEdges:this.resEditPP('ProcessEdges'),
-        VCut:this.resEditPP('VCut'),
-        CopperThickness:this.resEditPP('CopperThickness'),
-        InnerCopperThickness:this.resEditPP('InnerCopperThickness'),
-        SurfaceFinish:this.resEditPP('SurfaceFinish'),
-        FlyingProbe:this.resEditPP('FlyingProbe'),
-        Vias:this.resEditPP('Vias'),
-        LineWeight:this.resEditPP('LineWeight'),
-        CoreType:this.resEditPP('CoreType'),
-        CoreTg:this.resEditPP('CoreTg'),
-        BoardType:this.resEditPP('BoardType'),
-        AcceptCrossed:this.resEditPP('AcceptCrossed'),
-        ImGoldThinckness:this.resEditPP('ImGoldThinckness'),
-        IsImpedance:this.resEditPP('IsImpedance'),
-        ImpedanceReport:this.resEditPP('ImpedanceReport'),
-        IPCLevel:this.resEditPP('IPCLevel'),
-        NeedReportList:this.resEditPP('NeedReportList'),
-        ProductFileSure:this.resEditPP('ProductFileSure'),
-        CamEngineer:this.resEditPP('CamEngineer'),
-        FormingType:this.resEditPP('FormingType'),
-        BeforePlating:this.resEditPP('BeforePlating'),
-        ImageTranster:this.resEditPP('ImageTranster'),
-        SolderTransfer:this.resEditPP('SolderTransfer'),
-        ReportMaterial:this.resEditPP('ReportMaterial'),
-      }
-      this.loadOE = false;
-      this.formPQ={
-        orderId:this.orderId,
-        boardWidth:resOPED.areaProcessData.boardWidth,
-        boardHeight:resOPED.areaProcessData.boardHeight,
-        boardThickness:resOPED.pcbStandardProcessData.boardThickness,
-        boardLayers:resOPED.pcbStandardProcessData.boardLayers,
-        num:resOPED.areaProcessData.num,
-        solderColor:resOPED.pcbStandardProcessData.solderColor,
-        solderColorBottom:resOPED.pcbStandardProcessData.solderColorBottom,
-        fontColor:resOPED.pcbStandardProcessData.fontColor,
-        fontColorBottom:resOPED.pcbStandardProcessData.fontColorBottom,
-        solderCover:resOPED.pcbStandardProcessData.solderCover,
-        pinBanX:resOPED.areaProcessData.pinBanX,
-        pinBanY:resOPED.areaProcessData.pinBanY,
-        pinBanNum:resOPED.areaProcessData.pinBanNum,
-        processEdges:resOPED.areaProcessData.processEdges,
-        processEdgesWidth:resOPED.areaProcessData.processEdgesWidth,
-        vCut:resOPED.areaProcessData.vCut,
-        grooveHeight:resOPED.areaProcessData.grooveHeight,
-        grooveWidth:resOPED.areaProcessData.grooveWidth,
-        copperThickness:resOPED.pcbStandardProcessData.copperThickness,
-        innerCopperThickness:resOPED.pcbStandardProcessData.innerCopperThickness,
-        surfaceFinish:resOPED.pcbStandardProcessData.surfaceFinish,
-        flyingProbe:resOPED.pcbStandardProcessData.flyingProbe,
-        vias:resOPED.pcbStandardProcessData.vias,
-        lineWeight:resOPED.pcbStandardProcessData.lineWeight,
-        coreType:resOPED.pcbBaseData.coreType,
-        coreTg:resOPED.pcbBaseData.coreTg,
-        boardType:resOPED.areaProcessData.boardType,
-        acceptCrossed:resOPED.areaProcessData.acceptCrossed,
-        bgaNum:resOPED.personalizedProcessData.bgaNum,
-        bgaSize:resOPED.personalizedProcessData.bgaSize,
-        imGoldThinckness:resOPED.pcbStandardProcessData.imGoldThinckness,
-        impedanceReport:resOPED.personalizedProcessData.impedanceReport,
-        // impedanceSize:resOPED.personalizedProcessData.impedanceSize,
-        isImpedance:resOPED.personalizedProcessData.isImpedance,
-        boardHoleNum:resOPED.pcbProductionProcessData.boardHoleNum,
-        ipcLevel:resOPED.personalizedProcessData.ipcLevel,
-        needReportList:resOPED.personalizedProcessData.needReportList.split(','),
-        productFileSure:resOPED.personalizedProcessData.productFileSure,
-        camEngineer:resOPED.personalizedProcessData.camEngineer,
-        // aluminumType:resOPED.areaProcessData.aluminumType,
-        withstandVoltage:resOPED.pcbStandardProcessData.withstandVoltage,
-        formingType:resOPED.pcbStandardProcessData.formingType,
-        routLength:resOPED.pcbProductionProcessData.routLength,
-        beforePlating:resOPED.pcbStandardProcessData.beforePlating,
-        changeItemNum:resOPED.pcbProductionProcessData.changeItemNum,
-        changePeriod:resOPED.pcbProductionProcessData.changePeriod,
-        imageTranster:resOPED.pcbStandardProcessData.imageTranster,
-        utilizationRate:resOPED.pcbProductionProcessData.utilizationRate,
-        solderTransfer:resOPED.pcbStandardProcessData.solderTransfer,
-        wvTest:resOPED.pcbStandardProcessData.wvTest,
-        // halfHole:resOPED.areaProcessData.halfHole,
-        reportMaterial:resOPED.personalizedProcessData.reportMaterial,
-        IsOutFactory:resOPED.pcbBaseData.isOutFactory,
-        // Note:resOPED.orderDetail.note,
-        Note:'',
-        SpecialProcess:[],
-      }
-      //特殊工艺取类
-      let arrSpecial = [];
-      for (let i in this.PcbProcessType){
-        let ppt = this.PcbProcessType[i];
-        if(ppt.isSpecial === 1){
-          arrSpecial.push(ppt);
-        }
-      }
-      this.arrSpecialList = arrSpecial;
-      let fmSP = [];
-      for (let i in arrSpecial){
-        fmSP.push({typeName:arrSpecial[i].typeName,typeValue:''});
-      }
-      for(let i in fmSP){
-        let rSP = resOPED.pcbSpecialProcessData;
-        for (let rid in rSP){
-          if(fmSP[i].typeName==rSP[rid].typeName){
-            fmSP[i].typeValue = rSP[rid].typeValue;
-            continue;
-          }
-        }
-      }
-      this.selSL = fmSP;
+      // this.loadOE = true;
+      // this.PcbProcessType = await OrderParamDetail(this.orderId);
+      // let resOPED = await OrderDetail(this.orderId);
+      // this.typeList={
+      //   BoardLayers:this.resEditPP('BoardLayers'),
+      //   BoardThickness:this.resEditPP('BoardThickness'),
+      //   SolderColor:this.resEditPP('SolderColor'),
+      //   FontColor:this.resEditPP('FontColor'),
+      //   SolderCover:this.resEditPP('SolderCover'),
+      //   ProcessEdges:this.resEditPP('ProcessEdges'),
+      //   VCut:this.resEditPP('VCut'),
+      //   CopperThickness:this.resEditPP('CopperThickness'),
+      //   InnerCopperThickness:this.resEditPP('InnerCopperThickness'),
+      //   SurfaceFinish:this.resEditPP('SurfaceFinish'),
+      //   FlyingProbe:this.resEditPP('FlyingProbe'),
+      //   Vias:this.resEditPP('Vias'),
+      //   LineWeight:this.resEditPP('LineWeight'),
+      //   CoreType:this.resEditPP('CoreType'),
+      //   CoreTg:this.resEditPP('CoreTg'),
+      //   BoardType:this.resEditPP('BoardType'),
+      //   AcceptCrossed:this.resEditPP('AcceptCrossed'),
+      //   ImGoldThinckness:this.resEditPP('ImGoldThinckness'),
+      //   IsImpedance:this.resEditPP('IsImpedance'),
+      //   ImpedanceReport:this.resEditPP('ImpedanceReport'),
+      //   IPCLevel:this.resEditPP('IPCLevel'),
+      //   NeedReportList:this.resEditPP('NeedReportList'),
+      //   ProductFileSure:this.resEditPP('ProductFileSure'),
+      //   CamEngineer:this.resEditPP('CamEngineer'),
+      //   FormingType:this.resEditPP('FormingType'),
+      //   BeforePlating:this.resEditPP('BeforePlating'),
+      //   ImageTranster:this.resEditPP('ImageTranster'),
+      //   SolderTransfer:this.resEditPP('SolderTransfer'),
+      //   ReportMaterial:this.resEditPP('ReportMaterial'),
+      // }
+      // console.log(this.typeList)
+      // this.loadOE = false;
+      // this.formPQ={
+      //   orderId:this.orderId,
+      //   boardWidth:resOPED.areaProcessData.boardWidth,
+      //   boardHeight:resOPED.areaProcessData.boardHeight,
+      //   boardThickness:resOPED.pcbStandardProcessData.boardThickness,
+      //   boardLayers:resOPED.pcbStandardProcessData.boardLayers,
+      //   num:resOPED.areaProcessData.num,
+      //   solderColor:resOPED.pcbStandardProcessData.solderColor,
+      //   solderColorBottom:resOPED.pcbStandardProcessData.solderColorBottom,
+      //   fontColor:resOPED.pcbStandardProcessData.fontColor,
+      //   fontColorBottom:resOPED.pcbStandardProcessData.fontColorBottom,
+      //   solderCover:resOPED.pcbStandardProcessData.solderCover,
+      //   pinBanX:resOPED.areaProcessData.pinBanX,
+      //   pinBanY:resOPED.areaProcessData.pinBanY,
+      //   pinBanNum:resOPED.areaProcessData.pinBanNum,
+      //   processEdges:resOPED.areaProcessData.processEdges,
+      //   processEdgesWidth:resOPED.areaProcessData.processEdgesWidth,
+      //   vCut:resOPED.areaProcessData.vCut,
+      //   grooveHeight:resOPED.areaProcessData.grooveHeight,
+      //   grooveWidth:resOPED.areaProcessData.grooveWidth,
+      //   copperThickness:resOPED.pcbStandardProcessData.copperThickness,
+      //   innerCopperThickness:resOPED.pcbStandardProcessData.innerCopperThickness,
+      //   surfaceFinish:resOPED.pcbStandardProcessData.surfaceFinish,
+      //   flyingProbe:resOPED.pcbStandardProcessData.flyingProbe,
+      //   vias:resOPED.pcbStandardProcessData.vias,
+      //   lineWeight:resOPED.pcbStandardProcessData.lineWeight,
+      //   coreType:resOPED.pcbBaseData.coreType,
+      //   coreTg:resOPED.pcbBaseData.coreTg,
+      //   boardType:resOPED.areaProcessData.boardType,
+      //   acceptCrossed:resOPED.areaProcessData.acceptCrossed,
+      //   bgaNum:resOPED.personalizedProcessData.bgaNum,
+      //   bgaSize:resOPED.personalizedProcessData.bgaSize,
+      //   imGoldThinckness:resOPED.pcbStandardProcessData.imGoldThinckness,
+      //   impedanceReport:resOPED.personalizedProcessData.impedanceReport,
+      //   // impedanceSize:resOPED.personalizedProcessData.impedanceSize,
+      //   isImpedance:resOPED.personalizedProcessData.isImpedance,
+      //   boardHoleNum:resOPED.pcbProductionProcessData.boardHoleNum,
+      //   ipcLevel:resOPED.personalizedProcessData.ipcLevel,
+      //   needReportList:resOPED.personalizedProcessData.needReportList.split(','),
+      //   productFileSure:resOPED.personalizedProcessData.productFileSure,
+      //   camEngineer:resOPED.personalizedProcessData.camEngineer,
+      //   // aluminumType:resOPED.areaProcessData.aluminumType,
+      //   withstandVoltage:resOPED.pcbStandardProcessData.withstandVoltage,
+      //   formingType:resOPED.pcbStandardProcessData.formingType,
+      //   routLength:resOPED.pcbProductionProcessData.routLength,
+      //   beforePlating:resOPED.pcbStandardProcessData.beforePlating,
+      //   changeItemNum:resOPED.pcbProductionProcessData.changeItemNum,
+      //   changePeriod:resOPED.pcbProductionProcessData.changePeriod,
+      //   imageTranster:resOPED.pcbStandardProcessData.imageTranster,
+      //   utilizationRate:resOPED.pcbProductionProcessData.utilizationRate,
+      //   solderTransfer:resOPED.pcbStandardProcessData.solderTransfer,
+      //   wvTest:resOPED.pcbStandardProcessData.wvTest,
+      //   // halfHole:resOPED.areaProcessData.halfHole,
+      //   reportMaterial:resOPED.personalizedProcessData.reportMaterial,
+      //   IsOutFactory:resOPED.pcbBaseData.isOutFactory,
+      //   // Note:resOPED.orderDetail.note,
+      //   Note:'',
+      //   SpecialProcess:[],
+      // }
+      // //特殊工艺取类
+      // let arrSpecial = [];
+      // for (let i in this.PcbProcessType){
+      //   let ppt = this.PcbProcessType[i];
+      //   if(ppt.isSpecial === 1){
+      //     arrSpecial.push(ppt);
+      //   }
+      // }
+      // this.arrSpecialList = arrSpecial;
+      // let fmSP = [];
+      // for (let i in arrSpecial){
+      //   fmSP.push({typeName:arrSpecial[i].typeName,typeValue:''});
+      // }
+      // for(let i in fmSP){
+      //   let rSP = resOPED.pcbSpecialProcessData;
+      //   for (let rid in rSP){
+      //     if(fmSP[i].typeName==rSP[rid].typeName){
+      //       fmSP[i].typeValue = rSP[rid].typeValue;
+      //       continue;
+      //     }
+      //   }
+      // }
+      // this.selSL = fmSP;
       this.ifEdit = true;
+      // console.log(this.PcbProcessType)
     },
+    //提交修改订单
     upOrderEdit(){
-      let selSL = this.selSL;
-      let selSLDB = {};
-      for (let i in selSL){
-        let ts = selSL[i];
-        if (ts.typeValue!='' && ts.typeValue!='0'){
-          selSLDB[ts.typeName] = ts.typeValue.toString();
-          // selSLDB.push(obj);
+      let params = {
+        "guid":this.orderId,
+        "pinBanNum":this.orderParams.pinBanNum,
+        "orderDetailCheckDTO":{...this.orderParams},
+        "orderExtDTO": [//特殊工艺
+          // {
+          //   "typeName": "string",
+          //   "typeValue": "string"
+          // }
+        ],
+        // "reviewStatus": 0,
+        "sendEmail": false,
+        // "reviewCnRemark": ""
+      };
+      // console.log(params)
+      this.loadPage = true;
+      checkByOrder(params).then(res=>{
+        if(res.success){
+          this.$message.success('修改成功！');
+          this.ifEdit = false;
+          this.getOrderDetail()
+        }else{
+          this.$message.error(res.message);
         }
-      }
-      this.formPQ.SpecialProcess = selSLDB;
-      this.loadEdit = true;
-      let params = {...this.formPQ}
-      params.needReportList = params.needReportList.toString();
-      putOrderPcb(params).then(res=>{
-        this.$message.success('修改成功！');
-        this.ifEdit = false;
-        this.loadEdit = false;
-        this.getOrderDetail()
       }).catch(err=>{
-        this.loadEdit = false;
+        this.$message.error('修改失败！');
+      }).finally(()=>{
+        this.loadPage = false;
       })
     },
     //隐藏调整价格
@@ -1148,15 +359,45 @@ export default {
       //   that.$refs.formMoney.fnGetOrderMoney();
       // },500);
     },
-    //参数获取返回解析
-    resEditPP(key){
-      for (let i in this.PcbProcessType){
-        let ppt = this.PcbProcessType[i];
-        if(ppt.typeName==key){
-          let arr = ppt.processDataList.sort((a,b)=>a.dataValue - b.dataValue);
-          return arr;
+    //参数获取返回解析key= arr/str
+    resEditPP(key,type){
+      if (typeof key == 'string'){
+        for (let i in this.PcbProcessType){
+          let ppt = this.PcbProcessType[i];
+          if(ppt.key.toUpperCase()==key.toUpperCase()){
+            let arrVal = JSON.parse(ppt.value);
+            if (arrVal && arrVal.length>0){
+              let resArr = [];
+              for (let ii in arrVal[0]){
+                resArr.push({name:arrVal[0][ii],value:ii})
+              }
+              return resArr;
+            }
+          }
         }
       }
+      else if (typeof key == "object"){
+        if (key && key.length>0){
+          let resArr = [];
+          key = key[0];
+          for (let i in key){
+            let val = type=='number'?Number(i):i;
+            resArr.push({name:key[i],value:val})
+          }
+          return resArr;
+        }
+      }
+    },
+    //退出编辑
+    escEdit(){
+      this.ifEdit = false;
+      this.getOrderDetail();
+    },
+    //展示日志
+    fnShowLog(){
+      this.showLog = true;
+      this.$refs.altLog.orderId = this.orderId;
+      this.$refs.altLog.fnShowLog();
     },
     getSelTxt(type,key){
       return resSelects(type,key===0?key:key||'null');
@@ -1172,4 +413,4 @@ export default {
 td.t{color:#000}
 .ant-radio-button-wrapper.ant-radio-button-wrapper-checked{background-color:#f90; color:#fff}
 .ant-radio-button-wrapper{padding:0 10px;}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/pages/order/orderCheck.vue b/src/pages/order/orderCheck.vue
index 678e7bf..062ecd0 100644
--- a/src/pages/order/orderCheck.vue
+++ b/src/pages/order/orderCheck.vue
@@ -4,8 +4,8 @@
     <a-form-model-item label="审核操作" prop="statue">
       <a-radio-group v-model="form.statue">
         <a-radio :value="1">审核通过</a-radio>
-        <a-radio :value="2">审核不通过驳回</a-radio>
-        <a-radio :value="3" v-if="isST24">设置为外发</a-radio>
+        <a-radio :value="0">审核不通过驳回</a-radio>
+        <a-radio :value="2" v-if="isST24">设置为外发</a-radio>
       </a-radio-group>
     </a-form-model-item>
     <a-form-model-item v-if="isST24" label="问题类型">
@@ -28,6 +28,12 @@
     <a-form-model-item label="备注说明">
       <quill-editor :options="editorOption" ref="myTextEditor" v-model="form.content"></quill-editor>
     </a-form-model-item>
+    <a-form-model-item label="是否发邮件">
+      <a-radio-group button-style="solid" v-model="form.sendEmail">
+        <a-radio-button :value="true">是</a-radio-button>
+        <a-radio-button :value="false">否</a-radio-button>
+      </a-radio-group>
+    </a-form-model-item>
   </a-form-model>
     <div class="bn" v-if="!isAltN">
       <a-button type="primary" @click="fnOrderCheck">确定</a-button>
@@ -51,7 +57,7 @@ export default {
   data(){
     return{
       confirmSubmit:false,resFormTimes:'',isST24:false,
-      form:{orderId:'',sourceType:'',statue:'',type:null,contentType:null,content:''},
+      form:{orderId:'',sourceType:'',statue:'',type:null,contentType:null,content:'',sendEmail:false},
       layout:{labelCol:{span:5},wrapperCol:{span:18},},
       isAltN:false,loadPage:false,
       rules:{
@@ -148,4 +154,4 @@ export default {
 .bn{text-align:center; clear:both}
 /deep/ .ql-editor{height:220px}
 /deep/ .ql-toolbar.ql-snow{padding:3px 8px; line-height:24px}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/services/Common.js b/src/services/Common.js
index 6a95e77..702ecf7 100644
--- a/src/services/Common.js
+++ b/src/services/Common.js
@@ -92,7 +92,7 @@ export function resSelects(type='',val=''){
   }
   else if (type==='parseStatue'){
     list = [
-      {value:'0',text:'带解析'},
+      {value:'0',text:'待解析'},
       {value:'1',text:'锁定中'},
       {value:'2',text:'解析成功'},
       {value:'3',text:'解析失败'},
@@ -146,4 +146,4 @@ export function downloadBlobFile(content,type,fileName){
   } else { // IE10+下载
     navigator.msSaveBlob(blob, fileName)
   }
-}
\ No newline at end of file
+}
diff --git a/src/services/order/Order.js b/src/services/order/Order.js
index 1cfa22d..6edd96d 100644
--- a/src/services/order/Order.js
+++ b/src/services/order/Order.js
@@ -27,6 +27,20 @@ export function OrderMoney(id) {
 export function OrderUpdateMoney(params) {
   return requestApi(`/api/app/order/update-order-price`, METHOD.PUT, params)
 }
+// 审单同步结果到订单池保存数据
+export function checkByOrder(params) {
+  return requestApi(`/api/app/order/check-by-order`, METHOD.POST, params)
+}
+// 日志
+export function getLogs(params,id) {
+  return requestApi(`/api/app/order/log/${id}`, METHOD.GET, params)
+}
+
+
+
+
+
+
 
 /* 以下待删 */
 
diff --git a/src/utils/axios-interceptors.js b/src/utils/axios-interceptors.js
index 89309b9..21c94d0 100644
--- a/src/utils/axios-interceptors.js
+++ b/src/utils/axios-interceptors.js
@@ -10,9 +10,13 @@ const resp401 = {
    */
   onFulfilled(response, options) {
     const { message } = options;
+    console.log()
     if (response.code === 401) {
       message.error('无此权限');
     }
+    if (response?.data?.code==40002){
+      message.error(response?.data.message);
+    }
     return response;
   },
   /**
diff --git a/vue.config.js b/vue.config.js
index f54d323..0d2ea23 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -57,7 +57,8 @@ module.exports = {
     proxy: {
       ...proxyConfig,
       '/ids': {
-        target: 'http://192.168.19.4:44339',
+        // target: 'http://115.236.37.105:1136',
+        target: 'https://dfmserver.jiepei.com:44336/ids',
         changeOrigin: true,
         pathRewrite: {
           '^/ids': ''
@@ -65,7 +66,7 @@ module.exports = {
         logLevel: 'debug',
       },
       '/api': {
-        target: 'http://192.168.19.4:44332',
+        target: 'https://dfmserver.jiepei.com:44336',
         changeOrigin: true,
         pathRewrite: {},
         logLevel: 'debug',